fix compilation for GTK1

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 42eb601428900e98f976b47a8dbc38b2925c74cc..4ccd6d6a2d68d365ef001bdf161b1df9d1bb056f 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -83,6 +83,7 @@
 #undef __FREEBSD__
 #undef __DARWIN__
 #undef __NETBSD__
+#undef __OPENBSD__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
@@ -93,6 +94,7 @@
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
+#undef TARGET_CARBON
 
 /* MS-DOS with DJGPP */
 #undef __DOS__
@@ -102,13 +104,21 @@
 #undef __WINDOWS__
 #endif
 
+#ifndef __WIN95__
 #undef __WIN95__
+#endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif
+#ifndef __GNUWIN32__
 #undef __GNUWIN32__
+#endif
+#ifndef STRICT
 #undef STRICT
+#endif
+#ifndef WINVER
 #undef WINVER
+#endif
 
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
@@ -357,6 +367,10 @@
  * Use this control
  */
 #define wxUSE_CHOICE 0
+/*
+ * Use wxDisplay class
+ */
+#define wxUSE_DISPLAY 0
 /*
  * Use this control
  */
@@ -366,12 +380,12 @@
  */
 #define wxUSE_GRID 0
 /*
- * Use this control
+ * Use the new prototype wxGrid classes
+ * (wxUSE_GRID must also be defined)
  */
 #define wxUSE_NEW_GRID 0
 /*
- * Use the new prototype wxGrid classes
- * (wxUSE_GRID must also be defined)
+ * Use wxImageList class
  */
 #define wxUSE_IMAGLIST 0
 /*
@@ -746,6 +760,10 @@
  * Compatibility with 2.2 API
  */
 #define WXWIN_COMPATIBILITY_2_2 0
+/*
+ * Compatibility with 2.4 API
+ */
+#define WXWIN_COMPATIBILITY_2_4 0
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
@@ -880,6 +898,9 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 
+/* The type of statvfs(2) argument */
+#undef WX_STATFS_T
+
 /* The signal handler prototype */
 #undef wxTYPE_SA_HANDLER
 
@@ -890,6 +911,9 @@
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 
+/* Define if you have poll(2) function */
+#undef HAVE_POLL
+
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
@@ -905,12 +929,6 @@
 /* Define if you have support for large (64 bit size) files */
 #undef HAVE_LARGEFILE_SUPPORT
 
-/* Required by HAVE_LARGEFILE_SUPPORT on some systems */
-#undef _FILE_OFFSET_BITS
-
-/* Ditto */
-#undef _LARGE_FILES
-
 /* Define if you have localtime() */
 #undef HAVE_LOCALTIME
 
@@ -959,6 +977,9 @@
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
 
+/* Define if you have vsnprintf() declaration in the header */
+#undef HAVE_VSNPRINTF_DECL
+
 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 
@@ -1106,6 +1127,9 @@
 /* Define this if you have wprintf() and related functions */
 #undef HAVE_VSWPRINTF
 
+/* Define this if you have _vsnwprintf */
+#undef HAVE__VSNWPRINTF
+
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM