Fixed some include path problems, and some defines for windows build

This commit was SVN r5250.

src/mca/iof/base/iof_base_endpoint.c

@@ -17,12 +17,14 @@
 #endif
 #endif
 
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #include "util/output.h"
 #include "mca/rml/rml.h"
 #include "mca/iof/base/base.h"
-#include "iof_base_endpoint.h"
-#include "iof_base_fragment.h"
+#include "mca/iof/base/iof_base_endpoint.h"
+#include "mca/iof/base/iof_base_fragment.h"
 
 /**
  *  Construct/Destructor

src/mca/iof/base/iof_base_flush.c

@@ -11,12 +11,14 @@
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #include "util/output.h"
 #include "mca/oob/base/base.h"
 #include "mca/iof/base/base.h"
-#include "iof_base_endpoint.h"
-#include "iof_base_fragment.h"
+#include "mca/iof/base/iof_base_endpoint.h"
+#include "mca/iof/base/iof_base_fragment.h"
 
 /**
  * timer callback out of the event loop

src/mca/iof/base/iof_base_fragment.c

@@ -11,13 +11,15 @@
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #include "util/output.h"
 #include "mca/rml/rml.h"
 #include "mca/rml/rml_types.h"
 #include "mca/iof/base/base.h"
-#include "iof_base_endpoint.h"
-#include "iof_base_fragment.h"
+#include "mca/iof/base/iof_base_endpoint.h"
+#include "mca/iof/base/iof_base_fragment.h"
 
 
 /**

src/threads/condition.c

@@ -16,8 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mutex.h"
-#include "condition.h"
+#include "threads/mutex.h"
+#include "threads/condition.h"
 
 
 static void ompi_condition_construct(ompi_condition_t *c)

src/win32/win_compat.h

@@ -71,5 +71,8 @@ typedef unsigned int uint;
 #define mkdir _mkdir
 
 #define UINT32_MAX _UI32_MAX
+#define INT32_MAX _I32_MAX
+
+#define __func__ __FUNCTION__
 
 #endif /* compat */