Some small fixes.

This commit was SVN r18541.

opal/event/evutil.h

@@ -56,8 +56,8 @@ extern "C" {
 #define ev_uint64_t uint64_t
 #define ev_int64_t int64_t
 #elif defined(WIN32)
-#define ev_uint64_t __uint64_t
-#define ev_int64_t __int64_t
+#define ev_uint64_t uint64_t
+#define ev_int64_t int64_t
 #elif SIZEOF_LONG_LONG == 8
 #define ev_uint64_t unsigned long long
 #define ev_int64_t long long

opal/mca/crs/base/crs_base_select.c

@@ -18,7 +18,9 @@
 
 #include "opal_config.h"
 
+#ifdef HAVE_UNISTD_H
 #include "unistd.h"
+#endif
 
 #include "opal/include/opal/constants.h"
 #include "opal/util/output.h"

opal/mca/filter/base/filter_base_select.c

@@ -18,7 +18,9 @@
 
 #include "opal_config.h"
 
+#ifdef HAVE_UNISTD_H
 #include "unistd.h"
+#endif
 
 #include "opal/include/opal/constants.h"
 #include "opal/util/output.h"

opal/runtime/opal_cr.c

@@ -255,10 +255,6 @@ int opal_cr_init(void )
                                 false, false,
                                 SIGUSR1,
                                 &opal_cr_entry_point_signal);
-#else
-    opal_output( 0, "This feature is disabled on Windows" );
-    return 0;
-#endif  /* __WINDOWS__ */
 
     opal_output_verbose(10, opal_cr_output,
                         "opal_cr: init: Checkpoint Signal: %d",
@@ -280,6 +276,11 @@ int opal_cr_init(void )
         }
     }
 
+#else
+    opal_output( 0, "This feature is disabled on Windows" );
+    return 0;
+#endif  /* __WINDOWS__ */
+
     mca_base_param_reg_string_name("opal_cr", "tmp_dir",
                                    "Temporary directory to place rendezvous files for a checkpoint",
                                    false, false,