ChangeLogTag: Mon Jun 16 19:06:38 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu>

7 files changed, 33 insertions, 10 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index efc3bb199b6..1b2859849e5 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,14 @@
+Mon Jun 16 19:06:38 UTC 2008  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ace/config-borland-common.h:
+        * ace/config-hpux-11.00.h:
+        * ace/config-mvs.h:
+        * ace/config-win32-dmc.h:
+        * ace/config-win32-ghs.h:
+        * ace/config-win32-msvc.h:
+
+          Fixes for MCPP preprocessing on Windows. 
+        
 Mon Jun 16 19:06:44 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/Acceptor.cpp:
diff --git a/ACE/ace/config-borland-common.h b/ACE/ace/config-borland-common.h
index 4a964c583be..e6c857c3bbc 100644
--- a/ACE/ace/config-borland-common.h
+++ b/ACE/ace/config-borland-common.h
@@ -39,7 +39,10 @@
 # define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100)
 # define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100)
 # define ACE_CC_BETA_VERSION (0)
-# define ACE_CC_PREPROCESSOR_ARGS "-q -P- -o%s"
+
+# ifndef ACE_USING_MCPP_PREPROCESSOR
+#  define ACE_CC_PREPROCESSOR_ARGS "-q -P- -o%s"
+# endif
 
 # define ACE_EXPORT_NESTED_CLASSES 1
 # define ACE_HAS_CPLUSPLUS_HEADERS 1
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index 1b9ccce7216..4ef1353c7b0 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -24,8 +24,9 @@
 // aC++...
 
 // Precompiler needs extra flags to ignore "invalid #pragma directive"
-#    define ACE_CC_PREPROCESSOR_ARGS "-E +W 67"
-
+#    ifndef ACE_USING_MCPP_PREPROCESSOR
+#     define ACE_CC_PREPROCESSOR_ARGS "-E +W 67"
+#    endif
 // Compiler supports C++ exception handling. It's on by default. If the
 // +noeh compiler option is used to disable exceptions, the compiler defines
 // __HPACC_NOEH.
diff --git a/ACE/ace/config-mvs.h b/ACE/ace/config-mvs.h
index 34e6cf9e0e9..4545e151d0f 100644
--- a/ACE/ace/config-mvs.h
+++ b/ACE/ace/config-mvs.h
@@ -22,7 +22,9 @@
 #define ACE_MVS
 
 // Preprocesor requires an extra argument
-#define ACE_CC_PREPROCESSOR_ARGS "-+ -E"
+#ifndef ACE_USING_MCPP_PREPROCESSOR
+# define ACE_CC_PREPROCESSOR_ARGS "-+ -E"
+#endif
 
 // See the README file in this directory
 // for a description of the following ACE_ macros
diff --git a/ACE/ace/config-win32-dmc.h b/ACE/ace/config-win32-dmc.h
index 62fb8798092..2c6a45ceaee 100644
--- a/ACE/ace/config-win32-dmc.h
+++ b/ACE/ace/config-win32-dmc.h
@@ -28,8 +28,10 @@
 # define ACE_CC_MAJOR_VERSION (1)
 # define ACE_CC_MINOR_VERSION (8)
 # define ACE_CC_BETA_VERSION (9)
-# define ACE_CC_PREPROCESSOR "DMC.EXE"
-# define ACE_CC_PREPROCESSOR_ARGS "-E"
+# ifndef ACE_USING_MCPP_PREPROCESSOR
+#  define ACE_CC_PREPROCESSOR "DMC.EXE"
+#  define ACE_CC_PREPROCESSOR_ARGS "-E"
+# endif
 
 // Microsoft's standard cpp library auto_ptr doesn't have reset ().
 # define ACE_AUTO_PTR_LACKS_RESET
diff --git a/ACE/ace/config-win32-ghs.h b/ACE/ace/config-win32-ghs.h
index 64c4fbe77f7..95bf474852e 100644
--- a/ACE/ace/config-win32-ghs.h
+++ b/ACE/ace/config-win32-ghs.h
@@ -34,8 +34,10 @@
 # define ACE_CC_MAJOR_VERSION (1)
 # define ACE_CC_MINOR_VERSION (8)
 # define ACE_CC_BETA_VERSION (9)
-# define ACE_CC_PREPROCESSOR "GCX.EXE"
-# define ACE_CC_PREPROCESSOR_ARGS "-E"
+# ifndef ACE_USING_MCPP_PREPROCESSOR
+#  define ACE_CC_PREPROCESSOR "GCX.EXE"
+#  define ACE_CC_PREPROCESSOR_ARGS "-E"
+# endif
 
 // GHS uses Microsoft's standard cpp library, which has auto_ptr.
 # undef ACE_LACKS_AUTO_PTR
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index 537d5f99336..ab0c03f4041 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -22,8 +22,10 @@
 #endif /* ACE_CONFIG_WIN32_H */
 
 #define ACE_CC_NAME ACE_TEXT ("Visual C++")
-#define ACE_CC_PREPROCESSOR "CL.EXE"
-#define ACE_CC_PREPROCESSOR_ARGS "-nologo -E"
+#ifndef ACE_USING_MCPP_PREPROCESSOR
+# define ACE_CC_PREPROCESSOR "CL.EXE"
+# define ACE_CC_PREPROCESSOR_ARGS "-nologo -E"
+#endif
 
 #define ACE_CC_MAJOR_VERSION (_MSC_VER / 100 - 6)
 #define ACE_CC_MINOR_VERSION (_MSC_VER % 100)