On Windows we can now deliver Open MPI on several flavors:

- everything statically built (dynamically opened).
- OPAL, ORTE and OMPI static libraries and all the components
  as dynamic files(DLL).
- everything as dynamic files (DLL).

This commit was SVN r11461.

ompi/include/ompi_config.h.in

@@ -82,22 +82,27 @@ typedef struct {
 
 #  if defined(_USRDLL)    /* building shared libraries (.DLL) */
 #    if defined(OMPI_EXPORTS)
-#      define OMPI_DECLSPEC __declspec(dllexport)
+#      define OMPI_DECLSPEC        __declspec(dllexport)
+#      define OMPI_MODULE_DECLSPEC
 #    else
-#      define OMPI_DECLSPEC __declspec(dllimport)
-#    endif
-#    if defined(OMPI_MODULE_EXPORTS)
-#      define OMPI_MODULE_DECLSPEC __declspec(dllexport)
-#    else
-#      define OMPI_MODULE_DECLSPEC __declspec(dllimport)
-#    endif
+#      define OMPI_DECLSPEC        __declspec(dllimport)
+#      if defined(OMPI_MODULE_EXPORTS)
+#        define OMPI_MODULE_DECLSPEC __declspec(dllexport)
+#      else
+#        define OMPI_MODULE_DECLSPEC __declspec(dllimport)
+#      endif  /* defined(OMPI_MODULE_EXPORTS) */
+#    endif  /* defined(OMPI_EXPORTS) */
 #  else          /* building static library */
-#    define OMPI_DECLSPEC
+#    if defined(OMPI_IMPORTS)
+#      define OMPI_DECLSPEC        __declspec(dllimport)
+#    else
+#      define OMPI_DECLSPEC
+#    endif  /* defined(OMPI_IMPORTS) */
 #    define OMPI_MODULE_DECLSPEC
-#  endif
+#  endif  /* defined(_USRDLL) */
 #else
-#define OMPI_DECLSPEC
-#define OMPI_MODULE_DECLSPEC
+#  define OMPI_DECLSPEC
+#  define OMPI_MODULE_DECLSPEC
 #endif  /* defined(__WINDOWS__) */
 
 #endif

opal/include/opal_config_bottom.h

@@ -72,19 +72,24 @@
 
 #  if defined(_USRDLL)    /* building shared libraries (.DLL) */
 #    if defined(OPAL_EXPORTS)
-#      define OPAL_DECLSPEC __declspec(dllexport)
+#      define OPAL_DECLSPEC        __declspec(dllexport)
+#      define OPAL_MODULE_DECLSPEC
 #    else
-#      define OPAL_DECLSPEC __declspec(dllimport)
-#    endif
-#    if defined(OPAL_MODULE_EXPORTS)
-#      define OPAL_MODULE_DECLSPEC __declspec(dllexport)
-#    else
-#      define OPAL_MODULE_DECLSPEC __declspec(dllimport)
-#    endif
+#      define OPAL_DECLSPEC        __declspec(dllimport)
+#      if defined(OPAL_MODULE_EXPORTS)
+#        define OPAL_MODULE_DECLSPEC __declspec(dllexport)
+#      else
+#        define OPAL_MODULE_DECLSPEC __declspec(dllimport)
+#      endif  /* defined(OPAL_MODULE_EXPORTS) */
+#    endif  /* defined(OPAL_EXPORTS) */
 #  else          /* building static library */
-#    define OPAL_DECLSPEC
+#    if defined(OPAL_IMPORTS)
+#      define OPAL_DECLSPEC        __declspec(dllimport)
+#    else
+#      define OPAL_DECLSPEC
+#    endif  /* defined(OPAL_IMPORTS) */
 #    define OPAL_MODULE_DECLSPEC
-#  endif
+#  endif  /* defined(_USRDLL) */
 #  if OMPI_BUILDING
 #    include "opal/win32/win_compat.h"
 #  endif  /* OMPI_BUILDING */
@@ -92,7 +97,7 @@
    /* On Unix - this define is plain useless */
 #  define OPAL_DECLSPEC
 #  define OPAL_MODULE_DECLSPEC
-#endif
+#endif  /* defined(__WINDOWS__) */
 
 /*
  * Do we have <stdint.h>?
@@ -325,4 +330,15 @@ static inline uint16_t ntohs(uint16_t netvar) { return netvar; }
 #define IOVBASE_TYPE  void
 #endif  /* defined(__WINDOWS__) */
 
+/**
+ * If we generate our own bool type, we need a special way to cast the result
+ * in such a way to keep the compilers silent. Right now, th only compiler who
+ * complain about int to bool conversions is the Microsoft compiler.
+ */
+#if defined(__WINDOWS__)
+#  define OPAL_INT_TO_BOOL(VALUE)  ((VALUE) != 0 ? true : false)
+#else
+#  define OPAL_INT_TO_BOOL(VALUE)  (bool)(VALUE)
+#endif  /* defined(__WINDOWS__) */
+
 #endif /* OMPI_BUILDING */

orte/include/orte_config.h.in

@@ -28,22 +28,27 @@
 
 #  if defined(_USRDLL)    /* building shared libraries (.DLL) */
 #    if defined(ORTE_EXPORTS)
-#      define ORTE_DECLSPEC __declspec(dllexport)
+#      define ORTE_DECLSPEC         __declspec(dllexport)
+#      define ORTE_MODULE_DECLSPEC
 #    else
-#      define ORTE_DECLSPEC __declspec(dllimport)
-#    endif
-#    if defined(ORTE_MODULE_EXPORTS)
-#      define ORTE_MODULE_DECLSPEC __declspec(dllexport)
+#      define ORTE_DECLSPEC         __declspec(dllimport)
+#      if defined(ORTE_MODULE_EXPORTS)
+#        define ORTE_MODULE_DECLSPEC __declspec(dllexport)
+#      else
+#        define ORTE_MODULE_DECLSPEC __declspec(dllimport)
+#      endif  /* defined(ORTE_MODULE_EXPORTS) */
+#    endif  /* defined(ORTE_EXPORTS) */
+#  else          /* building static library or external includes */
+#    if defined(ORTE_IMPORTS)
+#      define ORTE_DECLSPEC        __declspec(dllimport)
 #    else
-#      define ORTE_MODULE_DECLSPEC __declspec(dllimport)
-#    endif
-#  else          /* building static library */
-#    define ORTE_DECLSPEC
+#      define ORTE_DECLSPEC
+#    endif  /* defined(ORTE_IMPORTS) */
 #    define ORTE_MODULE_DECLSPEC
 #  endif
 #else
-#define ORTE_DECLSPEC
-#define ORTE_MODULE_DECLSPEC
+#  define ORTE_DECLSPEC
+#  define ORTE_MODULE_DECLSPEC
 #endif  /* defined(__WINDOWS__) */
 
 #endif