harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r658282 - in /harmony/enhanced/classlib/trunk/modules: awt/src/main/native/lcmm/shared/NativeCMM.c luni/src/main/native/luni/unix/procimpl.c
Date Tue, 20 May 2008 15:36:24 GMT
Author: odeakin
Date: Tue May 20 08:36:24 2008
New Revision: 658282

URL: http://svn.apache.org/viewvc?rev=658282&view=rev
Log:
ifdef out calls to functions that do not exist on z/OS.

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/procimpl.c

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c?rev=658282&r1=658281&r2=658282&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/NativeCMM.c Tue
May 20 08:36:24 2008
@@ -27,7 +27,12 @@
 
 int gl_cmsErrorHandler(int errorCode, const char *msg) {
   if(errorCode == LCMS_ERRC_ABORTED) {
-    errMsg = _strdup(msg); // Throw exception later, after returning control from cmm
+    // Throw exception later, after returning control from cmm
+#ifndef ZOS
+    errMsg = _strdup(msg);
+#else
+    errMsg = strdup(msg);
+#endif
   }
 
   return 1;

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/procimpl.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/procimpl.c?rev=658282&r1=658281&r2=658282&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/procimpl.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/procimpl.c Tue
May 20 08:36:24 2008
@@ -150,6 +150,7 @@
   if (grdpid == -1) goto error;
 
   if (grdpid == 0) {
+#ifndef ZOS
     /* Close file descriptors that are not used */
     close(newFD[0][1]);
     close(newFD[1][0]);
@@ -163,6 +164,7 @@
     setCloseOnExec(newFD[2][1]);
     setCloseOnExec(forkedChildIsRunning[1]);
     setCloseOnExec(execvFailure[1]);
+#endif /* ZOS */
 
     /* Redirect pipes so grand-child inherits new pipes */
     char dummy = '\0';



Mime
View raw message