compilation fixes for --with-regex=sys

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 4dcc4f36dc0f3deabd2cb68f4c0862703d0549ac..8ce750d4646e28ca656f80fa79c9383889c81b3b 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 25 October 2006                                                     *
+ * Date : 4 June 2007                                                        *
  *                                                                           *
  *****************************************************************************/
 
@@ -88,6 +88,9 @@
 /* Define this if your version of GTK+ is greater than 2.6 */
 #define __WXGTK26__ 1
 
+/* Define this if your version of GTK+ is greater than 2.10 */
+#define __WXGTK210__ 1
+
 #include <types.h>
 typedef pid_t GPid;
 
@@ -143,9 +146,6 @@ typedef pid_t GPid;
 #undef __WINDOWS__
 #endif
 
-#ifndef __WIN95__
-#undef __WIN95__
-#endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif
@@ -167,10 +167,10 @@ typedef pid_t GPid;
 #endif
 
 
-#define WXWIN_COMPATIBILITY_2_4 1
-
 #define WXWIN_COMPATIBILITY_2_6 1
 
+#define WXWIN_COMPATIBILITY_2_8 1
+
 #define wxDIALOG_UNIT_COMPATIBILITY   1
 
 
@@ -191,7 +191,7 @@ typedef pid_t GPid;
 
 
 #ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 0
+    #define wxUSE_UNICODE 1
 #endif
 
 #define wxUSE_WCHAR_T 1
@@ -219,7 +219,12 @@ typedef pid_t GPid;
 
 #define wxUSE_STD_IOSTREAM  0
 
-#define wxUSE_STD_STRING  0
+#if defined(__DMC__) || defined(__WATCOMC__) \
+     || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_STRING  0
+#else
+    #define wxUSE_STD_STRING  0
+#endif
 
 #define wxUSE_PRINTF_POS_PARAMS 0
 
@@ -237,6 +242,7 @@ typedef pid_t GPid;
 #define wxUSE_TEXTFILE      1
 
 #define wxUSE_INTL          1
+#include <locale.h>
 
 #define wxUSE_DATETIME      1
 
@@ -255,6 +261,7 @@ typedef pid_t GPid;
 #define wxUSE_DYNAMIC_LOADER  0
 
 #define wxUSE_SOCKETS       1
+#include <socket.h>
 
 #define wxUSE_FILESYSTEM    1
 
@@ -304,11 +311,7 @@ typedef pid_t GPid;
 
 #define wxUSE_XRC       1
 
-#if wxUSE_XRC
-#define wxUSE_XML       1
-#else
-#  define wxUSE_XML       1
-#endif
+#define wxUSE_XML       wxUSE_XRC
 
 #define wxUSE_AUI       1
 
@@ -326,6 +329,8 @@ typedef pid_t GPid;
 
 #define wxUSE_TIPWINDOW    1
 
+#define wxUSE_STC 1
+
 #define wxUSE_ANIMATIONCTRL 1
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
@@ -333,11 +338,13 @@ typedef pid_t GPid;
 #define wxUSE_CHECKBOX     1
 #define wxUSE_CHECKLISTBOX 1
 #define wxUSE_CHOICE       1
+#define wxUSE_COLLPANE      1
 #define wxUSE_COLOURPICKERCTRL 1
 #define wxUSE_COMBOBOX     1
 #define wxUSE_DATAVIEWCTRL   1
 #define wxUSE_DATEPICKCTRL 1
 #define wxUSE_DIRPICKERCTRL 1
+#define wxUSE_EDITABLELISTBOX 1
 #define wxUSE_FILEPICKERCTRL 1
 #define wxUSE_FONTPICKERCTRL 1
 #define wxUSE_GAUGE        1
@@ -347,6 +354,7 @@ typedef pid_t GPid;
 #define wxUSE_RADIOBOX     1
 #define wxUSE_RADIOBTN     1
 #define wxUSE_SCROLLBAR    1
+#define wxUSE_SEARCHCTRL    1
 #define wxUSE_SLIDER       1
 #define wxUSE_SPINBTN      1
 #define wxUSE_SPINCTRL     1
@@ -537,6 +545,8 @@ typedef pid_t GPid;
 
 #define wxUSE_LIBTIFF       1
 
+#define wxUSE_TGA           1
+
 #define wxUSE_GIF           1
 
 #define wxUSE_PNM           1
@@ -562,14 +572,14 @@ typedef pid_t GPid;
 
 /* for some features we don't have dedicated configure switches, so just choose
  * the common values automatically */
-#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
+#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1
 #else
 #define wxUSE_OWNER_DRAWN 0
 #endif
 
 /* enable rich edit under Win32 */
-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN32__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #define wxUSE_RICHEDIT2 1
 #else
@@ -581,6 +591,10 @@ typedef pid_t GPid;
 
 #define wxUSE_UNICODE_MSLU 0
 
+#define wxUSE_UNICODE_UTF8 0
+
+#define wxUSE_UTF8_LOCALE_ONLY 0
+
 #define wxUSE_DC_CACHEING 1
 
 #define wxUSE_GADGETS 1
@@ -790,6 +804,11 @@ typedef pid_t GPid;
  */
 #define wxUSE_WEBKIT 1
 
+/*
+ * Objective-C class name uniquifying
+ */
+#define wxUSE_OBJC_UNIQUIFYING 0
+
 /*
  * The const keyword is being introduced more in wxWindows.
  * You can use this setting to maintain backward compatibility.
@@ -846,6 +865,9 @@ typedef pid_t GPid;
 /* Define if fsync() is available */
 #define HAVE_FSYNC 1
 
+/* Define if round() is available */
+/* #undef HAVE_ROUND */
+
 /* Define if you have ftime() */
 #define HAVE_FTIME
 
@@ -877,6 +899,9 @@ typedef pid_t GPid;
 /* Define if you have pthread_cancel */
 #define HAVE_PTHREAD_CANCEL 1
 
+/* Define if you have pthread_mutex_timedlock */
+#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK
+
 /* Define if you have pthread_attr_setstacksize */
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 
@@ -939,6 +964,9 @@ typedef pid_t GPid;
 /* Define if you have strptime() declaration */
 #define HAVE_STRPTIME_DECL 1
 
+/* Define if you have strtoull() and strtoll() */
+#define HAVE_STRTOULL 1
+
 /* Define if you have all functions to set thread priority */
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 
@@ -969,12 +997,12 @@ typedef pid_t GPid;
 /* Define if you have wcslen function  */
 #define HAVE_WCSLEN 1
 
+/* Define if you have wcstoull() and wcstoll() */
+#undef HAVE_WCSTOULL
+
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
-/* The number of bytes in a char.  */
-#define SIZEOF_CHAR 1
-
 /* The number of bytes in a wchar_t.  */
 #define SIZEOF_WCHAR_T 4
 
@@ -1137,6 +1165,9 @@ typedef pid_t GPid;
 #undef HAVE_WCTYPE_H
 #endif
 
+/* Define if you have <widec.h> (Solaris only) */
+#undef HAVE_WIDEC_H
+
 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #define HAVE_ICONV_H 1
 
@@ -1214,6 +1245,9 @@ typedef pid_t GPid;
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
+/* Define if you have the <sys/epoll.h> header file.  */
+#undef HAVE_SYS_EPOLL_H
+
 /* Define if fdopen is available.  */
 #define HAVE_FDOPEN 1
 
@@ -1230,10 +1264,6 @@ typedef pid_t GPid;
 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
-/* Define if the system headers declare the type boolean (which will conflict
- * with the jpeg headers unless HAVE_BOOLEAN is defined).  */
-#undef HAVE_BOOLEAN
-
 /* Define if the header pbt.h is missing.  */
 #undef NEED_PBT_H