Solve a few compilation problems on Windows.

This commit was SVN r23193.

ompi/mca/btl/tcp/btl_tcp_component.c

@@ -54,6 +54,7 @@
 #include "opal/util/output.h"
 #include "opal/util/argv.h"
 #include "opal/util/net.h"
+#include "opal/util/opal_sos.h"
 
 #include "orte/types.h"
 #include "orte/util/show_help.h"

opal/event/signal.c

@@ -48,7 +48,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <errno.h>
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>

opal/util/stacktrace.c

@@ -382,7 +382,7 @@ static void show_stackframe (int signo, siginfo_t * info, void * p)
 #endif /* OPAL_WANT_PRETTY_PRINT_STACKTRACE && ! defined(__WINDOWS__) */
 
 
-#if OPAL_WANT_PRETTY_PRINT_STACKTRACE && ! defined(__WINDOWS__)
+#if OPAL_WANT_PRETTY_PRINT_STACKTRACE
 void opal_stackframe_output(int stream)
 {   
     int traces_size;
@@ -439,7 +439,7 @@ char *opal_stackframe_output_string(void)
     return output;
 }
 
-#endif /* OPAL_WANT_PRETTY_PRINT_STACKTRACE && ! defined(__WINDOWS__) */
+#endif /* OPAL_WANT_PRETTY_PRINT_STACKTRACE */
 
 /**
  * Here we register the show_stackframe function for signals

opal/win32/win_compat.h

@@ -150,6 +150,7 @@ typedef unsigned int uint;
 #define umask                     _umask
 #define getch                     _getch
 #define random                    rand
+#define strtok_r                  strtok_s
 
 #ifndef UINT32_MAX
 #define UINT32_MAX            _UI32_MAX
@@ -220,10 +221,15 @@ typedef unsigned int uint;
  * No syslog.h on Windows, but these have to be defined somehow.
  * There could also be a notifier component later for Windows.
  */
-
+#define LOG_EMERG   0
+#define LOG_ALERT   1
 #define LOG_CRIT    2
+#define LOG_ERR     3
 #define LOG_WARNING 4
 #define LOG_NOTICE  5
+#define LOG_INFO    6
+#define LOG_DEBUG   7
+
 
 /*
  * Mask these to Windows equivalents

orte/mca/notifier/base/notifier_base_wrappers.c

@@ -146,7 +146,7 @@ const char* orte_notifier_base_sev2str(orte_notifier_base_severity_t severity)
 char *orte_notifier_base_peer_log(int errcode, orte_process_name_t *peer_proc, 
                                   const char *msg, va_list ap)
 {
-    char *buf = malloc(ORTE_NOTIFIER_MAX_BUF + 1);
+    char *buf = (char *) malloc(ORTE_NOTIFIER_MAX_BUF + 1);
     char *peer_host = NULL, *peer_name = NULL;
     char *pos = buf;
     char *errstr = (char*)orte_err2str(errcode);

orte/mca/odls/process/odls_process_module.c

@@ -36,6 +36,7 @@
 #include "orte/util/show_help.h"
 #include "opal/util/sys_limits.h"
 #include "opal/class/opal_pointer_array.h"
+#include "opal/util/opal_sos.h"
 
 #include "orte/runtime/orte_wait.h"
 #include "orte/runtime/orte_globals.h"

orte/mca/plm/process/plm_process_module.c

@@ -78,6 +78,7 @@
 #include "opal/util/trace.h"
 #include "opal/util/basename.h"
 #include "opal/util/opal_environ.h"
+#include "opal/util/opal_sos.h"
 
 #include "orte/util/name_fns.h"