Added the dps directory to the Windows build setup. Fixed a couple of include problems.

This commit was SVN r5252.

src/dps/dps_internal_functions.c

@@ -21,7 +21,9 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <math.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <string.h>
 
 #include "util/output.h"
@@ -30,9 +32,11 @@
 #include "mca/ns/ns_types.h"
 #include "mca/rmgr/rmgr_types.h"
 
-#include "dps_internal.h"
+#include "dps/dps_internal.h"
 
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h> 
+#endif
 
 /**
  * Internal-use only functions

src/dps/dps_load_unload.c

@@ -25,11 +25,13 @@
 #include "orte_config.h"
 
 #include <sys/types.h>
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 
 #include "mca/ns/base/base.h"
 
-#include "dps_internal.h"
+#include "dps/dps_internal.h"
 
 
 int orte_dps_unload(orte_buffer_t *buffer,

src/dps/dps_pack.c

@@ -25,7 +25,9 @@
 #include "orte_config.h"
 
 #include <sys/types.h>
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #include <string.h>
 
 #include "include/orte_constants.h"
@@ -34,7 +36,7 @@
 #include "mca/gpr/gpr_types.h"
 #include "mca/ns/ns_types.h"
 #include "mca/rmgr/rmgr_types.h"
-#include "dps_internal.h"
+#include "dps/dps_internal.h"
 
 /**
  * DPS_PACK_VALUE

src/dps/dps_peek.c

@@ -25,10 +25,11 @@
 #include "orte_config.h"
 
 #include <sys/types.h>
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 
-
-#include "dps_internal.h"
+#include "dps/dps_internal.h"
 
 int orte_dps_peek(orte_buffer_t *buffer,
                   orte_data_type_t *type,

src/dps/dps_unpack.c

@@ -25,7 +25,9 @@
 #include "orte_config.h"
 
 #include <sys/types.h>
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #include <string.h>
 
 #include "include/orte_constants.h"
@@ -33,7 +35,7 @@
 #include "mca/gpr/gpr_types.h"
 #include "mca/ns/ns_types.h"
 #include "mca/rmgr/rmgr_types.h"
-#include "dps_internal.h"
+#include "dps/dps_internal.h"
 
 /**
  * DPS UNPACK VALUE

src/dps/orte_dps_open_close.c

@@ -20,7 +20,7 @@
 
 #include "mca/base/mca_base_param.h"
 
-#include "dps_internal.h"
+#include "dps/dps_internal.h"
 
 /**
  * globals

src/win32/win_compat.h

@@ -73,6 +73,7 @@ typedef unsigned int uint;
 #define UINT32_MAX _UI32_MAX
 #define INT32_MAX _I32_MAX
 
+#define SIZEOF_SIZE_T 4
 #define __func__ __FUNCTION__
 
 #endif /* compat */

src/win_makefile

@@ -30,6 +30,7 @@ pkglibdir = ${prefix}/lib
 # list of components to build with the c compiler
 C_SUBDIRS =  \
         attribute \
+		  dps \
         class \
         communicator \
         datatype \
@@ -54,14 +55,9 @@ C_SUBDIRS =  \
         mca/io/base \
         mca/iof/base \
 		  mca/errmgr/base \
-#        mca/llm/base \
         mca/mpool/base \
         mca/ns/base \
-#        mca/one/base \
         mca/oob/base \
-#        mca/op/ \
-#        mca/pcm/base \
-#        mca/pcmclient/base \
         mca/pml/base \
         mca/ptl/base \
         mca/topo/base \