diff --git a/src/datatype/dt_module.c b/src/datatype/dt_module.c index d665363904..83853069d1 100644 --- a/src/datatype/dt_module.c +++ b/src/datatype/dt_module.c @@ -67,10 +67,10 @@ ompi_datatype_t ompi_mpi_lb = INIT_BASIC_TYPE( DT_LB, LB ); ompi_datatype_t ompi_mpi_char = INIT_BASIC_DATA( char, OMPI_ALIGNMENT_CHAR, CHAR, DT_FLAG_DATA_C ); ompi_datatype_t ompi_mpi_character = INIT_BASIC_DATA( char, OMPI_ALIGNMENT_CHAR, CHARACTER, DT_FLAG_DATA_FORTRAN ); ompi_datatype_t ompi_mpi_unsigned_char = INIT_BASIC_DATA( unsigned char, OMPI_ALIGNMENT_CHAR, UNSIGNED_CHAR, DT_FLAG_DATA_C ); -ompi_datatype_t ompi_mpi_byte = INIT_BASIC_DATA( unsigned char, OMPI_ALIGNMENT_CHAR, BYTE, DT_FLAG_DATA_C | DT_FLAG_DATA_INT ); +OMPI_DECLSPEC ompi_datatype_t ompi_mpi_byte = INIT_BASIC_DATA( unsigned char, OMPI_ALIGNMENT_CHAR, BYTE, DT_FLAG_DATA_C | DT_FLAG_DATA_INT ); ompi_datatype_t ompi_mpi_short = INIT_BASIC_DATA( short, OMPI_ALIGNMENT_SHORT, SHORT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT ); ompi_datatype_t ompi_mpi_unsigned_short = INIT_BASIC_DATA( unsigned short, OMPI_ALIGNMENT_SHORT, UNSIGNED_SHORT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT ); -ompi_datatype_t ompi_mpi_int = INIT_BASIC_DATA( int, OMPI_ALIGNMENT_INT, INT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT ); +OMPI_DECLSPEC ompi_datatype_t ompi_mpi_int = INIT_BASIC_DATA( int, OMPI_ALIGNMENT_INT, INT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT ); ompi_datatype_t ompi_mpi_unsigned = INIT_BASIC_DATA( unsigned int, OMPI_ALIGNMENT_INT, UNSIGNED_INT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT ); ompi_datatype_t ompi_mpi_long = INIT_BASIC_DATA( long, OMPI_ALIGNMENT_LONG, LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT ); ompi_datatype_t ompi_mpi_unsigned_long = INIT_BASIC_DATA( unsigned long, OMPI_ALIGNMENT_LONG, UNSIGNED_LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT ); diff --git a/src/mca/allocator/bucket/allocator_bucket.c b/src/mca/allocator/bucket/allocator_bucket.c index d402a90e02..8b11e004c7 100644 --- a/src/mca/allocator/bucket/allocator_bucket.c +++ b/src/mca/allocator/bucket/allocator_bucket.c @@ -49,7 +49,7 @@ struct mca_allocator_base_module_t* mca_allocator_bucket_module_init( { size_t alloc_size = sizeof(mca_allocator_bucket_t); mca_allocator_bucket_t * retval; - mca_allocator_bucket_t * allocator = malloc(alloc_size); + mca_allocator_bucket_t * allocator = (mca_allocator_bucket_t *) malloc(alloc_size); if(NULL == allocator) { return(NULL); } diff --git a/src/mca/ns/base/ns_base_open.c b/src/mca/ns/base/ns_base_open.c index 314889b813..2fcff7a480 100644 --- a/src/mca/ns/base/ns_base_open.c +++ b/src/mca/ns/base/ns_base_open.c @@ -47,7 +47,7 @@ orte_process_name_t orte_name_all = {ORTE_CELLID_MAX, ORTE_JOBID_MAX, ORTE_VPID_ * Global variables */ int mca_ns_base_output = -1; -mca_ns_base_module_t orte_ns = { +OMPI_DECLSPEC mca_ns_base_module_t orte_ns = { orte_ns_base_module_init_not_available, orte_ns_base_create_cellid_not_available, orte_ns_base_assign_cellid_to_process, diff --git a/src/mca/pml/base/pml_base_open.c b/src/mca/pml/base/pml_base_open.c index a4f349f18d..9cd8ef9a75 100644 --- a/src/mca/pml/base/pml_base_open.c +++ b/src/mca/pml/base/pml_base_open.c @@ -42,7 +42,7 @@ int mca_pml_base_progress(void) * Global variables */ int mca_pml_base_output = -1; -mca_pml_base_module_t mca_pml = { +OMPI_DECLSPEC mca_pml_base_module_t mca_pml = { NULL, /* pml_add_procs */ NULL, /* pml_del_procs */ NULL, /* pml_add_ptls */ diff --git a/src/mca/win_makefile b/src/mca/win_makefile index bd8aea8db6..5332b0cd9d 100644 --- a/src/mca/win_makefile +++ b/src/mca/win_makefile @@ -30,7 +30,7 @@ installdir = ${topdir}/src/Debug/lib C_SUBDIRS = \ allocator/bucket \ coll/basic \ - topo/unity/src + topo/unity # list of components to build with the cpp compiler # (because of the problem with OBJ_CLASS_INSTANCE) @@ -63,6 +63,7 @@ CFLAGS = \ /DWIN32 \ /DHAVE_CONFIG_H \ /DOMPI_SYSCONFDIR="\"${installdir}/share\"" \ + /DOMPI_BUILDING_WIN_DSO=1 \ /EHsc \ /ML \ /W0 \ @@ -78,6 +79,7 @@ CPPFLAGS = \ /TP \ /DHAVE_CONFIG_H \ /DOMPI_SYSCONFDIR="\"${installdir}/share\"" \ + /DOMPI_BUILDING_WIN_DSO=1 \ /EHsc \ /ML \ /W0 \ @@ -89,7 +91,7 @@ CPPFLAGS = \ # link with ompi.lib to resolve external symbols #OMPILIB = \ - "${topdir}/vcproj/ompi/Debug/libmpi.lib" +# "${topdir}/vcproj/ompi/Debug/libmpi.lib" OMPILIB = \ "${topdir}/src/libmpi.lib" @@ -126,7 +128,6 @@ prebuild: @cp '${gen_base}/coll-basic-version.h' '${copy_base}/coll/basic/' @cp '${gen_base}/io-romio-version.h' '${copy_base}/io/romio/' @cp '${gen_base}/topo-unity-version.h' '${copy_base}/topo/unity/' - clibs: ${C_SUBDIRS} prebuild @for dirs in ${C_SUBDIRS}; do \ diff --git a/src/op/op.c b/src/op/op.c index 838b2a3fd3..17f101834a 100644 --- a/src/op/op.c +++ b/src/op/op.c @@ -377,7 +377,7 @@ ompi_op_t ompi_mpi_op_replace = { /* * Map from ddt->id to position in op function pointer array */ -int ompi_op_ddt_map[DT_MAX_PREDEFINED]; +OMPI_DECLSPEC int ompi_op_ddt_map[DT_MAX_PREDEFINED]; /* diff --git a/src/request/request.c b/src/request/request.c index dafee45b89..7fc03a1fa6 100644 --- a/src/request/request.c +++ b/src/request/request.c @@ -21,11 +21,11 @@ #include "include/constants.h" ompi_pointer_array_t ompi_request_f_to_c_table; -volatile int ompi_request_waiting = 0; +OMPI_DECLSPEC volatile int ompi_request_waiting = 0; int ompi_request_poll_iterations = 20000; -ompi_mutex_t ompi_request_lock; -ompi_condition_t ompi_request_cond; -ompi_request_t ompi_request_null; +OMPI_DECLSPEC ompi_mutex_t ompi_request_lock; +OMPI_DECLSPEC ompi_condition_t ompi_request_cond; +OMPI_DECLSPEC ompi_request_t ompi_request_null; ompi_status_public_t ompi_status_empty; diff --git a/src/util/malloc.h b/src/util/malloc.h index 45ef28f2ec..41d6db4575 100644 --- a/src/util/malloc.h +++ b/src/util/malloc.h @@ -112,7 +112,7 @@ OMPI_DECLSPEC void *ompi_calloc(size_t nmembers, size_t size, const char *file, * 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_realloc(void *ptr, size_t size, const char *file, int line); +OMPI_DECLSPEC void *ompi_realloc(void *ptr, size_t size, const char *file, int line); /** * \internal