r10662: new upstream: 4.4.0. Changes to support X.org

[ctsim.git] / config.h.in

diff --git a/config.h.in b/config.h.in
index 8d7ac6b61d2ad2c93c1179fe69436a6fc76a116f..e772c6c1558e018284cdf4f265814a43d1cc161e 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -214,15 +214,14 @@
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 
-/* x thread supported */
-#undef X_THREAD_SUPPORT
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 #undef inline
+#endif
 
 /* Define to `long' if <sys/types.h> does not define. */
 #undef off_t