Corrected test for _vsnprintf

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 0544b3e8b0eed068dc89611092f10a248a57ac09..4ed1d58ae8d295d038a4d2a4f077c485c45894fa 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -61,8 +61,11 @@
 /* Define this if your version of GTK+ is greater than 1.2 */
 #undef __WXGTK12__
 
 /* Define this if your version of GTK+ is greater than 1.2 */
 #undef __WXGTK12__
 

+/* Define this if your version of GTK+ is greater than 1.2.7 */
+#undef __WXGTK127__
+

 /* Define this if your version of GTK+ is greater than 1.3 */
 /* Define this if your version of GTK+ is greater than 1.3 */

-#undef __WXGTK13__
+#undef __WXGTK20__

 
 /*
  * Define to 1 for Unix[-like] system
 
 /*
  * Define to 1 for Unix[-like] system


@@ -83,6 +86,7 @@
 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__
 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__

+#undef __NETBSD__

 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__


@@ -138,6 +142,7 @@
  */
 #define wxUSE_ODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
  */
 #define wxUSE_ODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1

+#define wxODBC_BACKWARD_COMPATABILITY 0

 /*
  * Use Threads
  */
 /*
  * Use Threads
  */


@@ -154,6 +159,7 @@
  * Use OpenGL
  */
 #define wxUSE_OPENGL 0
  * Use OpenGL
  */
 #define wxUSE_OPENGL 0

+#define wxUSE_GLCANVAS 0

 
 /*
  * Use GUI
 
 /*
  * Use GUI


@@ -164,6 +170,11 @@
  */
 #define wxUSE_NOGUI 0
 
  */
 #define wxUSE_NOGUI 0
 

+/*
+ * Catch fatal program exceptions
+ */
+#define wxUSE_ON_FATAL_EXCEPTION 0
+

 /*
  * Use constraints mechanism
  */
 /*
  * Use constraints mechanism
  */


@@ -257,6 +268,10 @@
  * Use this control
  */
 #define wxUSE_NOTEBOOK 0
  * Use this control
  */
 #define wxUSE_NOTEBOOK 0

+/*
+ * Use wxPlot class
+ */
+#define wxUSE_PLOT 0

 /*
  * Use this control
  */
 /*
  * Use this control
  */


@@ -328,7 +343,7 @@
  */
 #define wxUSE_TOOLBAR_SIMPLE 0
 
  */
 #define wxUSE_TOOLBAR_SIMPLE 0
 

-#if defined(__WXWINE__) || defined(__GNUWIN32__)
+#if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)

 #define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
 #define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1


@@ -415,20 +430,15 @@
 #define wxUSE_POSTSCRIPT 0
 
 /*
 #define wxUSE_POSTSCRIPT 0
 
 /*

- * Compile wxString with some Unicode support?
+ * Compile wxString with some Unicode (wide character) support?

  */
 #define wxUSE_WCHAR_T 0
 
 /*
  */
 #define wxUSE_WCHAR_T 0
 
 /*

- * Compile wxString in wide character (Unicode) mode?
+ * Compile wxWindows in Unicode mode (Win32 only for now)?

  */
 #define wxUSE_UNICODE 0
 
  */
 #define wxUSE_UNICODE 0
 

-/*
- * Compile wxString with (limited) multibyte char support?
- */
-#define wxUSE_MULTIBYTE 0
-

 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *


@@ -571,6 +581,7 @@
 /*
  * (virtual) filesystems code
  */
 /*
  * (virtual) filesystems code
  */

+#define wxUSE_FILESYSTEM 0

 #define wxUSE_FS_INET 0
 #define wxUSE_FS_ZIP 0
 
 #define wxUSE_FS_INET 0
 #define wxUSE_FS_ZIP 0
 


@@ -622,6 +633,9 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 

+/* The signal handler prototype */
+#undef wxTYPE_SA_HANDLER
+

 /* gettimeofday() usually takes 2 arguments, but some really old systems might
  * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */
 #undef WX_GETTIMEOFDAY_NO_TZ
 /* gettimeofday() usually takes 2 arguments, but some really old systems might
  * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */
 #undef WX_GETTIMEOFDAY_NO_TZ


@@ -629,6 +643,9 @@
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 

+/* Define if you have pw_gecos field in struct passwd */
+#undef HAVE_PW_GECOS
+

 /* Define if you have dlopen() */
 #undef HAVE_DLOPEN
 
 /* Define if you have dlopen() */
 #undef HAVE_DLOPEN
 


@@ -650,6 +667,12 @@
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 

+/* Define if you have sigaction() */
+#undef HAVE_SIGACTION
+
+/* Define if you have sigemptyset() */
+#undef HAVE_SIGEMPTYSET
+

 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 


@@ -680,6 +703,9 @@
 /* The number of bytes in a char.  */
 #undef SIZEOF_CHAR
 
 /* The number of bytes in a char.  */
 #undef SIZEOF_CHAR
 

+/* The number of bytes in a wchar_t.  */
+#undef SIZEOF_WCHAR_T
+

 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 


@@ -698,6 +724,9 @@
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 

+/* Define if you have the dlerror function.  */
+#undef HAVE_DLERROR
+

 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 
 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 


@@ -717,7 +746,7 @@
 #undef HAVE_STRTOK_R
 
 /* Define if you have thr_setconcurrency function */
 #undef HAVE_STRTOK_R
 
 /* Define if you have thr_setconcurrency function */

-#undef HaVE_THR_SETCONCURRENCY
+#undef HAVE_THR_SETCONCURRENCY

 
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
 
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME


@@ -755,6 +784,12 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 

+/* Define if you have the <iconv.h> header file.  */
+#undef HAVE_ICONV_H
+
+/* Define if you have the <langinfo.h> header file.  */
+#undef HAVE_LANGINFO_H
+

 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM