never undefine 'inline' keyword for C++ compilation

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

diff --git a/setup.h.in b/setup.h.in
index 6b51e00caad3496a61bb7ed0ffe0440103f9d7cc..c47f9abb77d27aa37cccc287a236fd26a4216a45 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,5 +1,5 @@
 
 

-/* This define (__WX_SETUP_H__) is used both to insure setup.h is included 
+/* This define (__WX_SETUP_H__) is used both to insure setup.h is included

  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__


@@ -8,9 +8,11 @@
     #pragma interface
 #endif
 
     #pragma interface
 #endif
 

-
+/* never undefine inline keyword for C++ compilation */
+#ifndef __cplusplus

 /* Define to empty if the keyword does not work.  */
 #undef const
 /* Define to empty if the keyword does not work.  */
 #undef const

+#endif

 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t