fix m_Matches overflow if Compile() is called more than once (bug 742236)

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index a553d06a27a7c22cb55a0740d594d9d809456b6e..4f9f5faef25d7c19a4289e75c29fe353bc8f7b7e 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -61,39 +61,45 @@
 /* Define this if your version of GTK+ is greater than 1.3 */
 #undef __WXGTK20__
 
 /* 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
  */
 #define wxUSE_UNIX 0
 
 #undef __UNIX__
 /*
  * Define to 1 for Unix[-like] system
  */
 #define wxUSE_UNIX 0
 
 #undef __UNIX__

-#undef __LINUX__
-#undef __SGI__
-#undef __HPUX__
-#undef __SYSV__
-#undef __SVR4__
+

 #undef __AIX__
 #undef __AIX__

-#undef __SUN__
-#undef __SOLARIS__
-#undef __SUNOS__
-#undef __ALPHA__
-#undef __IA64__
-#undef __OSF__

 #undef __BSD__
 #undef __BSD__

-#undef __FREEBSD__

 #undef __DARWIN__
 #undef __DARWIN__

+#undef __EMX__
+#undef __FREEBSD__
+#undef __HPUX__
+#undef __LINUX__

 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __NETBSD__
 #undef __OPENBSD__

-#undef __VMS__
+#undef __OSF__
+#undef __SGI__
+#undef __SOLARIS__
+#undef __SUN__
+#undef __SUNOS__
+#undef __SVR4__
+#undef __SYSV__

 #undef __ULTRIX__
 #undef __ULTRIX__

-#undef __DATA_GENERAL__
-#undef __EMX__
+#undef __UNIXWARE__
+#undef __VMS__
+
+#undef __IA64__
+#undef __ALPHA__

 
 /* NanoX (with wxX11) */
 #define wxUSE_NANOX 0
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
 
 /* NanoX (with wxX11) */
 #define wxUSE_NANOX 0
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__

+#undef TARGET_CARBON

 
 /* MS-DOS with DJGPP */
 #undef __DOS__
 
 /* MS-DOS with DJGPP */
 #undef __DOS__


@@ -103,13 +109,21 @@
 #undef __WINDOWS__
 #endif
 
 #undef __WINDOWS__
 #endif
 

+#ifndef __WIN95__

 #undef __WIN95__
 #undef __WIN95__

+#endif

 #ifndef __WIN32__
 #undef __WIN32__
 #endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif

+#ifndef __GNUWIN32__

 #undef __GNUWIN32__
 #undef __GNUWIN32__

+#endif
+#ifndef STRICT

 #undef STRICT
 #undef STRICT

+#endif
+#ifndef WINVER

 #undef WINVER
 #undef WINVER

+#endif

 
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
 
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)


@@ -122,7 +136,7 @@
 #endif
 
 /* enable rich edit under Win32 */
 #endif
 
 /* enable rich edit under Win32 */

-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)

 #define wxUSE_RICHEDIT 1
 #else
 #define wxUSE_RICHEDIT 0
 #define wxUSE_RICHEDIT 1
 #else
 #define wxUSE_RICHEDIT 0


@@ -138,6 +152,11 @@
  */
 #undef HAVE_EXPLICIT
 
  */
 #undef HAVE_EXPLICIT
 

+/*
+ * Define if your compiler supports const_cast<>()
+ */
+#undef HAVE_CONST_CAST
+

 /*
  * Use regex support
  */
 /*
  * Use regex support
  */


@@ -310,6 +329,11 @@
  */
 #define wxUSE_DRAGIMAGE 0
 
  */
 #define wxUSE_DRAGIMAGE 0
 

+/*
+ * Enable accessibility support
+ */
+#define wxUSE_ACCESSIBILITY 0
+

 /*
  * Use property sheet classes
  */
 /*
  * Use property sheet classes
  */


@@ -358,6 +382,10 @@
  * Use this control
  */
 #define wxUSE_CHOICE 0
  * Use this control
  */
 #define wxUSE_CHOICE 0

+/*
+ * Use wxDisplay class
+ */
+#define wxUSE_DISPLAY 0

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


@@ -367,12 +395,12 @@
  */
 #define wxUSE_GRID 0
 /*
  */
 #define wxUSE_GRID 0
 /*

- * Use this control
+ * Use the new prototype wxGrid classes
+ * (wxUSE_GRID must also be defined)

  */
 #define wxUSE_NEW_GRID 0
 /*
  */
 #define wxUSE_NEW_GRID 0
 /*

- * Use the new prototype wxGrid classes
- * (wxUSE_GRID must also be defined)
+ * Use wxImageList class

  */
 #define wxUSE_IMAGLIST 0
 /*
  */
 #define wxUSE_IMAGLIST 0
 /*


@@ -747,6 +775,10 @@
  * Compatibility with 2.2 API
  */
 #define WXWIN_COMPATIBILITY_2_2 0
  * 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
  */
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */


@@ -881,6 +913,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 type of statvfs(2) argument */
+#undef WX_STATFS_T
+

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


@@ -957,6 +992,9 @@
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
 
 /* 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
 
 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 


@@ -1110,6 +1148,8 @@
 /* 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
 

+/* Define this is you have X11/extensions/shape.h */
+#undef HAVE_XSHAPE

 
 /* -------------------------------------------------------------------------
    Win32 adjustments section
 
 /* -------------------------------------------------------------------------
    Win32 adjustments section