merged 2 overloaded functions into a single membersections

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 3fc7b0de047e2c6dff34a59ab54fa7307d6d4a3c..deffca77b9379cd15eb059c8f60732b263d372aa 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -42,6 +42,9 @@
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
+/* Define this to get extra features from GNU libc. */
+#undef _GNU_SOURCE
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t
 
@@ -58,6 +61,9 @@
 /* Define this if your version of GTK+ is greater than 1.3 */
 #undef __WXGTK20__
 
+/* Define this if your version of Motif is greater than 2.0 */
+#undef __WXMOTIF20__
+
 /*
  * Define to 1 for Unix[-like] system
  */
@@ -80,6 +86,7 @@
 #undef __FREEBSD__
 #undef __DARWIN__
 #undef __NETBSD__
+#undef __OPENBSD__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
@@ -90,6 +97,7 @@
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
+#undef TARGET_CARBON
 
 /* MS-DOS with DJGPP */
 #undef __DOS__
@@ -99,13 +107,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__)
@@ -134,6 +150,11 @@
  */
 #undef HAVE_EXPLICIT
 
+/*
+ * Define if your compiler supports const_cast<>()
+ */
+#undef HAVE_CONST_CAST
+
 /*
  * Use regex support
  */
@@ -354,6 +375,10 @@
  * Use this control
  */
 #define wxUSE_CHOICE 0
+/*
+ * Use wxDisplay class
+ */
+#define wxUSE_DISPLAY 0
 /*
  * Use this control
  */
@@ -363,12 +388,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
 /*
@@ -743,6 +768,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
  */
@@ -877,6 +906,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
 
@@ -887,6 +919,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
 
@@ -902,12 +937,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
 
@@ -956,6 +985,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
 
@@ -1043,9 +1075,6 @@
 /* Define if you have the usleep function.  */
 #undef HAVE_USLEEP
 
-/* Define if you have the vfork function.  */
-#undef HAVE_VFORK
-
 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H
 
@@ -1097,10 +1126,34 @@
 /* Define if you have wcsrtombs() function */
 #undef HAVE_WCSRTOMBS
 
+/* Define this if you have fputws() and putwc() */
+#undef HAVE_FPUTWC
+
+/* Define this if you have wprintf() and related functions */
+#undef HAVE_WPRINTF
+
+/* 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
 
 
+/* -------------------------------------------------------------------------
+   Win32 adjustments section
+   ------------------------------------------------------------------------- */
+
+#ifdef __WIN32__
+
+/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibility
+   with wx/msw/setup.h */
+#define wxUSE_XPM_IN_MSW wxUSE_XPM
+
+#endif /* __WIN32__ */
+
 /* --------------------------------------------------------*
  *  This stuff is static, it doesn't get modified directly
  *  by configure.