some fixes and additions to get Windows libmpi to build.

This commit was SVN r5572.

src/Makefile.am

@@ -34,6 +34,7 @@ WIN32_FILES = win32/ompi_declspec.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/schema_static-components.h  \
               win32/generated_include/rmaps_static-components.h \
               win32/generated_include/soh_static-components.h \
               win32/generated_include/ns_static-components.h    \

src/datatype/fake_stack.c

@@ -38,8 +38,8 @@ static int ompi_convertor_generic_parse( ompi_convertor_t* pConvertor,
     int bConverted = 0;    /* number of bytes converted this time */ 
     ompi_datatype_t *pData = pConvertor->pDesc; 
     dt_elem_desc_t* pElem; 
-    char* iov_base; 
+    char * iov_base_local; 
-    uint32_t iov_len, i; 
+    uint32_t iov_len_local, i; 
     uint32_t iov_count, total_bytes_converted = 0; 
  
     DUMP( "convertor_decode( %p, {%p, %d}, %d )\n", (void*)pConvertor, 
@@ -61,8 +61,8 @@ static int ompi_convertor_generic_parse( ompi_convertor_t* pConvertor,
              */
             *freeAfter = (*freeAfter) | (1 << iov_count);
         }
-        iov_base = iov[iov_count].iov_base; 
+        iov_base_local = iov[iov_count].iov_base; 
-        iov_len = iov[iov_count].iov_len; 
+        iov_len_local = iov[iov_count].iov_len; 
         bConverted = 0;
         while( 1 ) { 
             if( DT_END_LOOP == pElem[pos_desc].elem.common.type ) { /* end of the current loop */
@@ -88,18 +88,18 @@ static int ompi_convertor_generic_parse( ompi_convertor_t* pConvertor,
                 int stop_in_loop = 0;
                 if( pElem[pos_desc].loop.common.flags & DT_FLAG_CONTIGUOUS ) {
                     ddt_endloop_desc_t* end_loop = &(pElem[pos_desc + pElem[pos_desc].loop.items].end_loop);
-                    if( (end_loop->size * count_desc) > iov_len ) {
+                    if( (end_loop->size * count_desc) > iov_len_local ) {
                         stop_in_loop = count_desc;
-                        count_desc = iov_len / end_loop->size;
+                        count_desc = iov_len_local / end_loop->size;
                     }
                     for( i = 0; i < count_desc; i++ ) {
                         /*
                          *  DO SOMETHING USEFULL ...
                          */
-                        iov_base += end_loop->size;  /* size of the contiguous data */
+                        iov_base_local += end_loop->size;  /* size of the contiguous data */
                         disp_desc += pElem[pos_desc].loop.extent;
                     }
-                    iov_len -= (end_loop->size * count_desc);
+                    iov_len_local -= (end_loop->size * count_desc);
                     bConverted += (end_loop->size * count_desc);
                     if( stop_in_loop == 0 ) {
                         pos_desc += pElem[pos_desc].loop.items + 1;

src/dps/orte_dps_open_close.c

@@ -37,7 +37,7 @@ bool orte_dps_debug = false;
 int orte_dps_page_size;
 orte_pointer_array_t *orte_dps_types;
 
-orte_dps_t orte_dps = {
+OMPI_DECLSPEC orte_dps_t orte_dps = {
     orte_dps_pack,
     orte_dps_unpack,
     orte_dps_peek,

src/mca/schema/base/schema_base_open.c

@@ -36,7 +36,7 @@
  * globals
  */
 
-orte_schema_base_module_t orte_schema = {
+OMPI_DECLSPEC orte_schema_base_module_t orte_schema = {
     orte_schema_base_get_proc_tokens,
     orte_schema_base_get_node_tokens,
     orte_schema_base_get_cell_tokens,

src/mca/win_makefile

@@ -30,7 +30,6 @@ installdir = ${topdir}/src/Debug/lib
 C_SUBDIRS = \
         allocator/bucket \
         coll/basic \
-        ns/proxy/src \
         topo/unity/src
 
 # list of components to build with the cpp compiler
@@ -42,6 +41,7 @@ CPP_SUBDIRS = \
         oob/tcp \
         pml/teg/src \
         ns/replica/src \
+        ns/proxy/src \
         gpr/proxy \
         gpr/replica
 
@@ -61,7 +61,6 @@ INCL = \
 
 CFLAGS = \
         /DWIN32 \
-        /DOMPI_BUILDING=0 \
         /DHAVE_CONFIG_H \
         /DOMPI_SYSCONFDIR="\"${installdir}/share\"" \
         /EHsc \
@@ -77,7 +76,6 @@ CFLAGS = \
 CPPFLAGS = \
         /DWIN32 \
         /TP \
-        /DOMPI_BUILDING=0 \
         /DHAVE_CONFIG_H \
         /DOMPI_SYSCONFDIR="\"${installdir}/share\"" \
         /EHsc \
@@ -132,12 +130,12 @@ prebuild:
 
 clibs: ${C_SUBDIRS} prebuild
 	@for dirs in ${C_SUBDIRS}; do \
-	    (libname=`echo mca_$${dirs}.dll | sed 's/\/src[\/]*//g' | sed 's/\//_/g' | sed 's/_\./\./g'` ; cd $$dirs; ${CC} ${CFLAGS} ${INCL} *.c; ${LINK} ${LINKFLAGS} ${ADDLIBS} /OUT:$${libname} *.obj); \
+	    (libname=`echo mca_$${dirs}.dll | sed 's/\/src[\/]*//g' | sed 's/\//_/g' | sed 's/_\./\./g'` ; cd $$dirs; echo ${CC} ${CPPFLAGS} ${INCL} *.c; ${CC} ${CFLAGS} ${INCL} *.c; echo ${LINK} ${LINKFLAGS} ${ADDLIBS} /OUT:$${libname} *.obj; ${LINK} ${LINKFLAGS} ${ADDLIBS} /OUT:$${libname} *.obj); \
 	done
 
 cpplibs: ${CPP_SUBDIRS} prebuild
 	@for dirs in ${CPP_SUBDIRS}; do \
-	    (libname=`echo mca_$${dirs}.dll | sed 's/\/src[\/]*//g' | sed 's/\//_/g' | sed 's/_\./\./g'` ; cd $$dirs; ${CC} ${CPPFLAGS} ${INCL} *.c; ${LINK} ${LINKFLAGS} ${ADDLIBS} /OUT:$${libname} *.obj); \
+	    (libname=`echo mca_$${dirs}.dll | sed 's/\/src[\/]*//g' | sed 's/\//_/g' | sed 's/_\./\./g'` ; cd $$dirs; echo ${CC} ${CPPFLAGS} ${INCL} *.c; ${CC} ${CPPFLAGS} ${INCL} *.c; echo ${LINK} ${LINKFLAGS} ${ADDLIBS} /OUT:$${libname} *.obj; ${LINK} ${LINKFLAGS} ${ADDLIBS} /OUT:$${libname} *.obj); \
 	done
 
 install: win_makefile

src/tools/win_makefile

@@ -48,7 +48,6 @@ INCL = \
 
 CFLAGS = \
         /DWIN32 \
-        /DOMPI_BUILDING=0 \
         /DHAVE_CONFIG_H \
         /DOMPI_SYSCONFDIR="\"${installdir}/share\"" \
         /EHsc \
@@ -64,7 +63,6 @@ CFLAGS = \
 CPPFLAGS = \
         /DWIN32 \
         /TP \
-        /DOMPI_BUILDING=0 \
         /DHAVE_CONFIG_H \
         /DOMPI_SYSCONFDIR="\"${installdir}/share\"" \
         /EHsc \

src/util/malloc.h

@@ -96,7 +96,7 @@ OMPI_DECLSPEC void *ompi_malloc(size_t size, const char *file, int line);
    * This function is only used when --enable-mem-debug was specified to
    * configure (or by default if you're building in a SVN checkout).
    */
-void *ompi_calloc(size_t nmembers, size_t size, const char *file, int line);
+OMPI_DECLSPEC void *ompi_calloc(size_t nmembers, size_t size, const char *file, int line);
 
   /**
    * \internal

src/win32/generated_include/ompi_config.h

@@ -562,6 +562,9 @@
 
 #define MCA_pml_DIRECT_CALL 0
 
+#define SIZE_MAX ((size_t) 0)
+#define UINT8_MAX 255
+
 #include "ompi_config_bottom.h"
 #endif /* OMPI_CONFIG_H */
 

src/win32/generated_include/schema_static-components.h

@@ -0,0 +1,10 @@
+/*
+ * $HEADER$
+ */
+
+
+
+const mca_base_component_t *mca_schema_base_static_components[] = {
+
+  NULL
+};

src/win_makefile

@@ -30,13 +30,13 @@ pkglibdir = ${prefix}/lib
 # list of components to build with the c compiler
 C_SUBDIRS =  \
         attribute \
-		  dps \
         class \
         communicator \
         datatype \
         errhandler \
         event \
         event/WIN32-Code \
+        dps \
         file \
         group \
         info \
@@ -52,19 +52,24 @@ C_SUBDIRS =  \
         mca/allocator/base \
         mca/coll/base \
         mca/gpr/base \
+        mca/gpr/base/data_type_support \
         mca/io/base \
         mca/iof/base \
 		  mca/errmgr/base \
 		  mca/rml/base \
 		  mca/rmgr/base \
+        mca/rmgr/base/data_type_support \
         mca/rmaps/base \
 		  mca/soh/base \
+        mca/soh/base/data_type_support \
         mca/mpool/base \
         mca/ns/base \
+        mca/ns/base/data_type_support \
         mca/oob/base \
         mca/pml/base \
         mca/ptl/base \
         mca/topo/base \
+        mca/schema/base \
         win32/generated_source \
         win \
         win32 
@@ -109,6 +114,7 @@ INCL = \
 CFLAGS = \
         /DWIN32 \
         /DOMPI_BUILDING=1 \
+        /DOMPI_BUILDING_LIBRARY=1 \
         /DOMPI_SYSCONFDIR="\"${sysconfdir}\"" \
         /DOMPI_PKGLIBDIR="\"${pkglibdir}\"" \
         /DOMPI_PKGDATADIR="\"${pkgdatadir}\"" \
@@ -138,6 +144,7 @@ STATIC_LIBS = \
         ptl\
         oob\
         pml\
+        schema \
         ns\
         gpr \
         iof