harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r813800 - in /harmony/enhanced: drlvm/trunk/make/vm/ drlvm/trunk/vm/jitrino/src/jet/ drlvm/trunk/vm/jitrino/src/shared/ drlvm/trunk/vm/port/src/file_io/win/ jdktools/trunk/modules/samsa/src/main/native/samsa/
Date Fri, 11 Sep 2009 12:26:26 GMT
Author: tellison
Date: Fri Sep 11 12:26:22 2009
New Revision: 813800

URL: http://svn.apache.org/viewvc?rev=813800&view=rev
Log:
Fixes to avoid compiler errors reported using MSVC 2008 compiler.

Modified:
    harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jdefs.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/mkernel.h
    harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/canonical.c
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c

Modified: harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml?rev=813800&r1=813799&r2=813800&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml Fri Sep 11 12:26:22 2009
@@ -64,9 +64,21 @@
             <compilerarg value="/Zi" if="is.windows"/>
             <compilerarg value="/W3" if="is.windows"/>
             <compilerarg value="/WX" if="is.windows" unless="is.x86_64"/>
-            <!-- C4996: 'function': was declared deprecated -->
-            <compilerarg value="/wd4996" if="is.windows"/>
 
+            <!-- 'identifier' : macro redefinition -->
+            <compilerarg value="/wd4005" if="is.msvc"/>
+
+            <!-- 'function': was declared deprecated -->
+            <compilerarg value="/wd4996" if="is.msvc"/>
+
+            <!-- 'operator' : 'identifier1' differs in levels of indirection from 'identifier2'
-->
+            <compilerarg value="/wd4047" if="is.msvc"/>
+
+            <!-- 'function' : different types for formal and actual parameter 'number'
-->
+            <compilerarg value="/wd4024" if="is.msvc"/>
+
+            <!-- The file contains a character that cannot be represented in the current
code page -->
+            <compilerarg value="/wd4819" if="is.msvc"/>
 
             <defineset define="MACOSX" if="is.macosx"/>
             <defineset define="FREEBSD" if="is.freebsd"/>

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jdefs.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jdefs.h?rev=813800&r1=813799&r2=813800&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jdefs.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jdefs.h Fri Sep 11 12:26:22 2009
@@ -74,7 +74,9 @@
      */
     #define MK_I64(a)   ((jlong)(a ## L))
     #define snprintf    _snprintf
-    #define vsnprintf    _vsnprintf
+    #if _MSC_VER < 1500
+        #define vsnprintf    _vsnprintf
+    #endif
     #ifndef strcasecmp
         #ifdef _MSC_VER
             #define strcasecmp  _stricmp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/mkernel.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/mkernel.h?rev=813800&r1=813799&r2=813800&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/mkernel.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/mkernel.h Fri Sep 11 12:26:22 2009
@@ -44,7 +44,9 @@
     // ..     sdkupdate/2600.2180.7/contents.htm
         #include <winsock2.h>
         #include <windows.h>
-        #define vsnprintf _vsnprintf
+        #if _MSC_VER < 1500
+            #define vsnprintf _vsnprintf
+        #endif
     #pragma pack(pop)
     // ... well, just to be absolutely sure...
     #undef min

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/canonical.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/canonical.c?rev=813800&r1=813799&r2=813800&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/canonical.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/canonical.c Fri Sep 11 12:26:22 2009
@@ -20,12 +20,12 @@
 */  
 
 #include <direct.h>
-#include <windows.h>
-
 #include <apr_strings.h>
 
 #include "port_filepath.h"
 
+#include <windows.h>
+
 APR_DECLARE(char *) port_filepath_canonical(const char* original,
 												 apr_pool_t* pool)
 {

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c?rev=813800&r1=813799&r2=813800&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c Fri Sep 11
12:26:22 2009
@@ -25,11 +25,18 @@
 #if defined(WIN32)
 #include <windows.h>
 #include <sys/stat.h>
+
+/* If using the MSVC2008 compiler */
+#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#pragma warning(disable: 4996)   // 'strdup' was deprecated
+#endif
+
 #else
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #endif
+
 #if defined(FREEBSD)
 #include <dlfcn.h>
 #endif



Mime
View raw message