The header file ompi_config.h should be included in ompi_info.h file but not in the .cc files. This make it could be compiled with VC compiler, and it works no difference under linux systems.

This commit was SVN r14435.

ompi/tools/ompi_info/components.cc

@@ -16,17 +16,15 @@
 // $HEADER$
 //
 
-#include "ompi_config.h"
-
 #include <iostream>
 #include <string>
 
 #include <stdlib.h>
 #include <string.h>
 
+#include "ompi/tools/ompi_info/ompi_info.h"
 #include "ompi/runtime/params.h"
 #include "orte/runtime/runtime.h"
-#include "ompi/tools/ompi_info/ompi_info.h"
 
 #include "opal/event/event.h"
 #include "opal/mca/base/base.h"

ompi/tools/ompi_info/ompi_info.cc

@@ -16,8 +16,6 @@
 // $HEADER$
 //
 
-#include "ompi_config.h"
-
 #include <iostream>
 #include <string>
 #include <utility>
@@ -36,6 +34,7 @@
 #endif
 #include <errno.h>
 
+#include "ompi/tools/ompi_info/ompi_info.h"
 #include "opal/install_dirs.h"
 #include "opal/class/opal_object.h"
 #include "opal/runtime/opal.h"
@@ -46,7 +45,7 @@
 #include "opal/util/show_help.h"
 #include "ompi/communicator/communicator.h"
 #include "opal/mca/base/base.h"
-#include "ompi/tools/ompi_info/ompi_info.h"
+
 #include "opal/threads/mutex.h"
 
 using namespace std;

ompi/tools/ompi_info/ompi_info.h

@@ -19,6 +19,8 @@
 #ifndef OMPI_INFO_H
 #define OMPI_INFO_H
 
+#include "ompi_config.h"
+
 #include <string>
 #include <vector>
 #include <map>

ompi/tools/ompi_info/output.cc

@@ -16,8 +16,6 @@
 // $HEADER$
 //
 
-#include "ompi_config.h"
-
 #include <iostream>
 #include <string>
 

ompi/tools/ompi_info/param.cc

@@ -16,12 +16,12 @@
 // $HEADER$
 //
 
-#include "ompi_config.h"
-
 #include <iostream>
 #include <string>
 #include <map>
 
+#include "ompi/tools/ompi_info/ompi_info.h"
+
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -38,7 +38,6 @@
 #include "opal/util/show_help.h"
 #include "opal/memoryhooks/memory.h"
 #include "opal/mca/base/mca_base_param.h"
-#include "ompi/tools/ompi_info/ompi_info.h"
 
 using namespace std;
 using namespace ompi_info;

ompi/tools/ompi_info/version.cc

@@ -16,18 +16,16 @@
 // $HEADER$
 //
 
-#include "ompi_config.h"
-
 #include <iostream>
 #include <string>
 
 #include <stdio.h>
 
+#include "ompi/tools/ompi_info/ompi_info.h"
 #include "opal/version.h"
 #include "orte/version.h"
 #include "ompi/version.h"
 #include "opal/mca/base/base.h"
-#include "ompi/tools/ompi_info/ompi_info.h"
 #include "opal/util/printf.h"
 
 using namespace std;