harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r521314 - in /harmony/enhanced/classlib/trunk/modules: luni/src/main/native/launcher/shared/cmain.c nio/src/main/native/nio/windows/makefile portlib/src/main/native/port/shared/hyportcontrol.c
Date Thu, 22 Mar 2007 15:41:11 GMT
Author: odeakin
Date: Thu Mar 22 08:41:10 2007
New Revision: 521314

URL: http://svn.apache.org/viewvc?view=rev&rev=521314
Log:
Fix compilation errors on Windows x86 with -Dhy.no.sig=true.

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyportcontrol.c

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c?view=diff&rev=521314&r1=521313&r2=521314
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c Thu
Mar 22 08:41:10 2007
@@ -87,7 +87,9 @@
   HyPortLibraryVersion portLibraryVersion;
   struct haCmdlineOptions options;
   int rc = 257;
+#if !defined(HY_NO_SIG)
   UDATA result;
+#endif /* HY_NO_SIG */
 
   /* Use portlibrary version which we compiled against, and have allocated space
    * for on the stack.  This version may be different from the one in the linked DLL.

Modified: harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile?view=diff&rev=521314&r1=521313&r2=521314
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile Thu Mar
22 08:41:10 2007
@@ -32,7 +32,7 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = \
-  $(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \
+  $(LIBPATH)hycommon.lib $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \
   $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
   
 DLLBASE=0x13200000

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyportcontrol.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyportcontrol.c?view=diff&rev=521314&r1=521313&r2=521314
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyportcontrol.c
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyportcontrol.c
Thu Mar 22 08:41:10 2007
@@ -52,7 +52,7 @@
       return 0;
     }
 
-#if defined(WIN32)
+#if defined(WIN32) && !defined(HY_NO_SIG)
   if (!strcmp ("SIG_INTERNAL_HANDLER", key))
     {
       /* used by optimized code to implement fast signal handling on Windows */



Mime
View raw message