Changeset 27592

Timestamp:

Apr 3, 2010, 2:02:46 PM (16 years ago)

Author:

bills

Message:

fix or workaround compile problems on MacOS

Location:

trunk/Ohana/src/opihi

Files:

• lib.shell/gprint.c (modified) (1 diff)
• pcontrol/StartHost.c (modified) (1 diff)
• pcontrol/StopHosts.c (modified) (1 diff)

trunk/Ohana/src/opihi/lib.shell/gprint.c

@@ -351 +351 @@
 
   // there are two strerror_r implementations; choose the right one:
-#if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE)
+#if (((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) || __APPLE__)
   strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
   errorMsg = errorBuf;

trunk/Ohana/src/opihi/pcontrol/StartHost.c

@@ -14 +14 @@
   if (VarConfig ("SHELL", "%s", shell)     == NULL) strcpy (shell, "pclient");
 
-  if (VerboseMode()) gprint (GP_ERR, "starting host within thread %lld\n", (long long) pthread_self());
-
+  if (VerboseMode()) gprint (GP_ERR, "starting host within thread %lld\n", (int64_t) pthread_self());
   pid = rconnect (command, host[0].hostname, shell, stdio);
   if (!pid) {     

trunk/Ohana/src/opihi/pcontrol/StopHosts.c

@@ -121 +121 @@
   int i, result, waitstatus;
 
+#ifndef __APPLE__
   if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %lld\n", (long long) pthread_self());
+#endif
   if (VerboseMode()) gprint (GP_ERR, "child process %d is down, wait for exit status\n", pid);