Corrected a few unistd lib protection defines. Added a couple of new files to the dist for the windows build

This commit was SVN r5261.

src/Makefile.am

@@ -29,6 +29,10 @@ WIN32_FILES = win32/ompi_declspec.h \
               win32/win_compat.h    \
               win32/generated_include/allocator_static-components.h  \
               win32/generated_include/iof_static-components.h   \
+              win32/generated_include/errmgr_static-components.h \
+              win32/generated_include/rml_static-components.h   \
+              win32/generated_include/rmgr_static-components.h  \
+              win32/generated_include/soh_static-components.h \
               win32/generated_include/ns_static-components.h    \
               win32/generated_include/pcmclient-seed-version.h  \
               win32/generated_include/pml_static-components.h   \

src/dps/dps_internal_functions.c

@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <math.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <string.h>

src/event/event.c

@@ -43,11 +43,9 @@
 #include <sys/queue.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifndef WIN32
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#endif
 #include <errno.h>
 #include <string.h>
 #include <err.h>

src/mca/errmgr/base/errmgr_base_fns.c

@@ -16,7 +16,7 @@
 
 
 #include "orte_config.h"
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <stdlib.h>

src/mca/ns/base/ns_base_nds_pipe.c

@@ -17,7 +17,7 @@
  */
 
 #include "orte_config.h"
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <stdlib.h>

src/mca/rmgr/base/rmgr_base_context.c

@@ -15,7 +15,7 @@
  */
 #include "ompi_config.h"
 #include <errno.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <string.h>

src/mca/rmgr/base/rmgr_base_pack.c

@@ -13,7 +13,7 @@
  */
 #include "ompi_config.h"
 #include <errno.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <string.h>

src/mca/rmgr/base/rmgr_base_unpack.c

@@ -13,7 +13,7 @@
  */
 #include "ompi_config.h"
 #include <errno.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <string.h>

src/runtime/orte_init_stage1.c

@@ -19,7 +19,7 @@
 #include "orte_config.h"
 
 #include <sys/types.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 

src/runtime/orte_restart.c

@@ -19,7 +19,7 @@
 #include "orte_config.h"
 
 #include <sys/types.h>
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif