don't define __cplusplus for DECCXX if it is already defined

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 82bfc41fb36c21dfbcf220be3cabe08b5bf5ae0b..6eba12944614ef6a31794405a98ce05c55751a69 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -122,11 +122,12 @@
 #endif // VC++ 1.5
 
 // Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files,
-// so define it ourselves
+// so define it ourselves (newer versions do it for all files, though, and
+// don't allow it to be redefined)
 #ifdef __DECCXX
-#ifndef __VMS
-# define __cplusplus
-#endif
+    #if !defined(__VMS) && !defined(__cplusplus)
+        #define __cplusplus
+    #endif
 #endif // __DECCXX
 
 // Resolves linking problems under HP-UX