some more changes which are required

This commit was SVN r3473.

include/ompi_config_bottom.h

@@ -18,11 +18,13 @@
 #define OMPI_COMP_EXPORT __declspec(dllexport)
 #endif
 
-#if defined(WIN32) && defined(OMPI_BUILDING)
+#if defined(WIN32) 
+#if defined(OMPI_BUILDING) && OMPI_BUILDING
 #define OMPI_DECLSPEC __declspec(dllexport)
 #else
 #define OMPI_DECLSPEC __declspec(dllimport)
 #endif
+#endif
 
 #ifndef OMPI_DECLSPEC
 #define OMPI_DECLSPEC
@@ -37,7 +39,7 @@
  * constants.  OMPI_NEED_C_BOOL will be true if the compiler either
  * needs <stdbool.h> or doesn't define the bool type at all.
  */
-#ifndef __cplusplus && defined(OMPI_BUILDING) && OMPI_BUILDING
+#if !defined(__cplusplus) && defined(OMPI_BUILDING)
 #    if OMPI_NEED_C_BOOL
 #        if OMPI_USE_STDBOOL_H
              /* If we're using <stdbool.h>, there is an implicit

vcproj/ompi/ompi.vcproj

@@ -18,7 +18,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/I&quot;../generated_include&quot; /I&quot;../../src/win32/generated_include&quot; /I&quot;../../include&quot; /I&quot;../../src&quot; /I&quot;../../src/event/compat/&quot; /I&quot;../../src/event/WIN32-Code&quot; /D&quot;__i386__&quot;  /D&quot;HAVE_CONFIG_H&quot; /DOMPI_PKGDATADIR=&quot;\&quot;C:/cygwin/ompi-new/vcproj/ompi/Debug\&quot;&quot; /DOMPI_PKGLIBDIR=&quot;\&quot;C:/cygwin/ompi-new/vcpro/ompi/Debug\&quot;&quot; /DOMPI_SYSCONFDIR=&quot;\&quot;C:/cygwin/ompi-new/vcproj/ompi/Debug\&quot;&quot; /DOMPI_BUILDING"
+				AdditionalOptions="/I&quot;../generated_include&quot; /I&quot;../../src/win32/generated_include&quot; /I&quot;../../include&quot; /I&quot;../../src&quot; /I&quot;../../src/event/compat/&quot; /I&quot;../../src/event/WIN32-Code&quot; /D&quot;__i386__&quot;  /D&quot;HAVE_CONFIG_H&quot; /DOMPI_PKGDATADIR=&quot;\&quot;C:/cygwin/ompi-new/vcproj/ompi/Debug\&quot;&quot; /DOMPI_PKGLIBDIR=&quot;\&quot;C:/cygwin/ompi-new/vcpro/ompi/Debug\&quot;&quot; /DOMPI_SYSCONFDIR=&quot;\&quot;C:/cygwin/ompi-new/vcproj/ompi/Debug\&quot;&quot; /DOMPI_BUILDING=1"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				GeneratePreprocessedFile="0"

vcproj/openmpi/openmpi.vcproj

@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="openmpi"
+	Name="hello"
 	ProjectGUID="{00041BD4-5225-4A91-9FD1-CF0F2B32AB4C}"
 	Keyword="Win32Proj">
 	<Platforms>