compilation fixes for --with-regex=sys

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 382eebec3febf354aa70c5e3b59fd1364ecf9ec3..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)                            *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *

- * Date : 9 June 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.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;
 
 #include <types.h>
 typedef pid_t GPid;
 


@@ -143,9 +146,6 @@ typedef pid_t GPid;
 #undef __WINDOWS__
 #endif
 
 #undef __WINDOWS__
 #endif
 

-#ifndef __WIN95__
-#undef __WIN95__
-#endif

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


@@ -167,10 +167,10 @@ typedef pid_t GPid;
 #endif
 
 
 #endif
 
 

-#define WXWIN_COMPATIBILITY_2_4 1
-

 #define WXWIN_COMPATIBILITY_2_6 1
 
 #define WXWIN_COMPATIBILITY_2_6 1
 

+#define WXWIN_COMPATIBILITY_2_8 1
+

 #define wxDIALOG_UNIT_COMPATIBILITY   1
 
 
 #define wxDIALOG_UNIT_COMPATIBILITY   1
 
 


@@ -191,7 +191,7 @@ typedef pid_t GPid;
 
 
 #ifndef wxUSE_UNICODE
 
 
 #ifndef wxUSE_UNICODE

-    #define wxUSE_UNICODE 0
+    #define wxUSE_UNICODE 1

 #endif
 
 #define wxUSE_WCHAR_T 1
 #endif
 
 #define wxUSE_WCHAR_T 1


@@ -219,7 +219,12 @@ typedef pid_t GPid;
 
 #define wxUSE_STD_IOSTREAM  0
 
 
 #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
 
 
 #define wxUSE_PRINTF_POS_PARAMS 0
 


@@ -237,6 +242,7 @@ typedef pid_t GPid;
 #define wxUSE_TEXTFILE      1
 
 #define wxUSE_INTL          1
 #define wxUSE_TEXTFILE      1
 
 #define wxUSE_INTL          1

+#include <locale.h>

 
 #define wxUSE_DATETIME      1
 
 
 #define wxUSE_DATETIME      1
 


@@ -255,17 +261,22 @@ typedef pid_t GPid;
 #define wxUSE_DYNAMIC_LOADER  0
 
 #define wxUSE_SOCKETS       1
 #define wxUSE_DYNAMIC_LOADER  0
 
 #define wxUSE_SOCKETS       1

+#include <socket.h>

 
 #define wxUSE_FILESYSTEM    1
 
 #define wxUSE_FS_ZIP        1
 
 
 #define wxUSE_FILESYSTEM    1
 
 #define wxUSE_FS_ZIP        1
 

+#define wxUSE_FS_ARCHIVE    1
+

 #define wxUSE_FS_INET       1
 
 #define wxUSE_ARCHIVE_STREAMS     1
 
 #define wxUSE_ZIPSTREAM     1
 
 #define wxUSE_FS_INET       1
 
 #define wxUSE_ARCHIVE_STREAMS     1
 
 #define wxUSE_ZIPSTREAM     1
 

+#define wxUSE_TARSTREAM     1
+

 #define wxUSE_ZLIB          1
 
 #define wxUSE_APPLE_IEEE          0
 #define wxUSE_ZLIB          1
 
 #define wxUSE_APPLE_IEEE          0


@@ -286,6 +297,8 @@ typedef pid_t GPid;
 
 #define wxUSE_URL_NATIVE 0
 
 
 #define wxUSE_URL_NATIVE 0
 

+#define wxUSE_VARIANT 1
+

 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 1
 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 1


@@ -298,14 +311,14 @@ typedef pid_t GPid;
 
 #define wxUSE_XRC       1
 
 
 #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
 
 
 #define wxUSE_AUI       1
 

+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+

 #define wxUSE_CONTROLS     1
 
 #ifdef __WXMOTIF__
 #define wxUSE_CONTROLS     1
 
 #ifdef __WXMOTIF__


@@ -316,17 +329,22 @@ typedef pid_t GPid;
 
 #define wxUSE_TIPWINDOW    1
 
 
 #define wxUSE_TIPWINDOW    1
 

+#define wxUSE_STC 1
+
+#define wxUSE_ANIMATIONCTRL 1

 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 1
 #define wxUSE_CHECKBOX     1
 #define wxUSE_CHECKLISTBOX 1
 #define wxUSE_CHOICE       1
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 1
 #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_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
 #define wxUSE_FILEPICKERCTRL 1
 #define wxUSE_FONTPICKERCTRL 1
 #define wxUSE_GAUGE        1


@@ -336,6 +354,7 @@ typedef pid_t GPid;
 #define wxUSE_RADIOBOX     1
 #define wxUSE_RADIOBTN     1
 #define wxUSE_SCROLLBAR    1
 #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
 #define wxUSE_SLIDER       1
 #define wxUSE_SPINBTN      1
 #define wxUSE_SPINCTRL     1


@@ -378,6 +397,8 @@ typedef pid_t GPid;
 
 #define wxUSE_ODCOMBOBOX 1
 
 
 #define wxUSE_ODCOMBOBOX 1
 

+#define wxUSE_BITMAPCOMBOBOX 1
+

 #define wxUSE_ACCEL 1
 
 #define wxUSE_HOTKEY 1
 #define wxUSE_ACCEL 1
 
 #define wxUSE_HOTKEY 1


@@ -436,6 +457,7 @@ typedef pid_t GPid;
 
 #define wxUSE_WIZARDDLG 1
 
 
 #define wxUSE_WIZARDDLG 1
 

+#define wxUSE_ABOUTDLG 1

 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0


@@ -477,6 +499,8 @@ typedef pid_t GPid;
 
 #define wxUSE_HELP        1
 
 
 #define wxUSE_HELP        1
 

+#define wxUSE_MS_HTML_HELP 0
+

 #define wxUSE_WXHTML_HELP 1
 
 #define wxUSE_RESOURCES   1
 #define wxUSE_WXHTML_HELP 1
 
 #define wxUSE_RESOURCES   1


@@ -521,6 +545,8 @@ typedef pid_t GPid;
 
 #define wxUSE_LIBTIFF       1
 
 
 #define wxUSE_LIBTIFF       1
 

+#define wxUSE_TGA           1
+

 #define wxUSE_GIF           1
 
 #define wxUSE_PNM           1
 #define wxUSE_GIF           1
 
 #define wxUSE_PNM           1


@@ -535,18 +561,25 @@ typedef pid_t GPid;
 
 #define wxUSE_PALETTE       1
 
 
 #define wxUSE_PALETTE       1
 

+#define wxUSE_ALL_THEMES    0
+
+#define wxUSE_THEME_GTK     0
+#define wxUSE_THEME_METAL   0
+#define wxUSE_THEME_MONO    0
+#define wxUSE_THEME_WIN32   0
+

 /* --- end common options --- */
 
 /* for some features we don't have dedicated configure switches, so just choose
  * the common values automatically */
 /* --- end common options --- */
 
 /* 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 */
 #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
 #define wxUSE_RICHEDIT 1
 #define wxUSE_RICHEDIT2 1
 #else


@@ -558,6 +591,10 @@ typedef pid_t GPid;
 
 #define wxUSE_UNICODE_MSLU 0
 
 
 #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
 #define wxUSE_DC_CACHEING 1
 
 #define wxUSE_GADGETS 1


@@ -597,6 +634,21 @@ typedef pid_t GPid;
  */
 #undef VA_LIST_IS_ARRAY
 
  */
 #undef VA_LIST_IS_ARRAY
 

+/*
+ * Define if the compiler supports variadic macros
+ */
+#undef HAVE_VARIADIC_MACROS
+
+#if defined(__NAMESPACE_STD) && !defined(__NAMESPACE_STD_ONLY)
+/*
+ * Define if your compiler has std::wstring
+ */
+#define HAVE_STD_WSTRING 1
+/*
+ * Define if your compiler has compliant std::string::compare
+ */
+#define HAVE_STD_STRING_COMPARE 1
+#else

 /*
  * Define if your compiler has std::wstring
  */
 /*
  * Define if your compiler has std::wstring
  */


@@ -605,6 +657,8 @@ typedef pid_t GPid;
  * Define if your compiler has compliant std::string::compare
  */
 #undef HAVE_STD_STRING_COMPARE
  * Define if your compiler has compliant std::string::compare
  */
 #undef HAVE_STD_STRING_COMPARE

+#endif
+

 /*
  * Define if your compiler has <hash_map>
  */
 /*
  * Define if your compiler has <hash_map>
  */


@@ -714,9 +768,11 @@ typedef pid_t GPid;
  */
 #define wxUSE_X_RESOURCES 1
 /*
  */
 #define wxUSE_X_RESOURCES 1
 /*

- * Use OLE (MSW only)
+ * Use OLE and OLE Automation (MSW only)

  */
 #define wxUSE_OLE 0
  */
 #define wxUSE_OLE 0

+#define wxUSE_OLE_AUTOMATION 0
+#define wxUSE_ACTIVEX 0

 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES


@@ -748,6 +804,11 @@ typedef pid_t GPid;
  */
 #define wxUSE_WEBKIT 1
 
  */
 #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.
 /*
  * The const keyword is being introduced more in wxWindows.
  * You can use this setting to maintain backward compatibility.


@@ -759,6 +820,11 @@ typedef pid_t GPid;
  */
 #define CONST_COMPATIBILITY 0
 
  */
 #define CONST_COMPATIBILITY 0
 

+/*
+ * use the session manager to detect KDE/GNOME
+ */
+#define wxUSE_DETECT_SM     0
+

 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
  
 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
  


@@ -799,6 +865,9 @@ typedef pid_t GPid;
 /* Define if fsync() is available */
 #define HAVE_FSYNC 1
 
 /* 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
 
 /* Define if you have ftime() */
 #define HAVE_FTIME
 


@@ -830,6 +899,9 @@ typedef pid_t GPid;
 /* Define if you have pthread_cancel */
 #define HAVE_PTHREAD_CANCEL 1
 
 /* 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
 
 /* Define if you have pthread_attr_setstacksize */
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 


@@ -873,6 +945,10 @@ typedef pid_t GPid;
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_SNPRINTF_DECL
 
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_SNPRINTF_DECL
 

+/* Define if you have a snprintf() which supports positional arguments
+   (defined in the unix98 standard) */
+#undef HAVE_UNIX98_PRINTF
+

 /* define if you have statfs function */
 #undef HAVE_STATFS
 
 /* define if you have statfs function */
 #undef HAVE_STATFS
 


@@ -888,6 +964,9 @@ typedef pid_t GPid;
 /* Define if you have strptime() declaration */
 #define HAVE_STRPTIME_DECL 1
 
 /* 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
 
 /* Define if you have all functions to set thread priority */
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 


@@ -918,12 +997,12 @@ typedef pid_t GPid;
 /* Define if you have wcslen function  */
 #define HAVE_WCSLEN 1
 
 /* 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
 
 /* 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
 
 /* The number of bytes in a wchar_t.  */
 #define SIZEOF_WCHAR_T 4
 


@@ -1086,6 +1165,9 @@ typedef pid_t GPid;
 #undef HAVE_WCTYPE_H
 #endif
 
 #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
 
 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #define HAVE_ICONV_H 1
 


@@ -1128,6 +1210,14 @@ typedef pid_t GPid;
 /* Define this if you have wprintf() and related functions */
 #define HAVE_WPRINTF 1
 
 /* Define this if you have wprintf() and related functions */
 #define HAVE_WPRINTF 1
 

+
+/* Define this if you have swprintf() */
+#define HAVE_SWPRINTF 1
+
+/* Define if you have a _broken_ swprintf() declaration in the header,
+ * without a 'size_t max' parameter as second argument */
+#undef HAVE_BROKEN_SWPRINTF_DECL
+

 /* Define this if you have vswprintf() and related functions */
 #define HAVE_VSWPRINTF 1
 
 /* Define this if you have vswprintf() and related functions */
 #define HAVE_VSWPRINTF 1
 


@@ -1155,8 +1245,11 @@ typedef pid_t GPid;
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 

-/* Define if you have the <sys/select.h> header file.  */
-#undef HAVE_SYS_SELECT_H
+/* Define if you have the <sys/epoll.h> header file.  */
+#undef HAVE_SYS_EPOLL_H
+
+/* Define if fdopen is available.  */
+#define HAVE_FDOPEN 1

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


@@ -1171,6 +1264,9 @@ typedef pid_t GPid;
 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 

+/* Define if the header pbt.h is missing.  */
+#undef NEED_PBT_H
+

 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*
 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*


@@ -1189,4 +1285,6 @@ typedef pid_t GPid;
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #define wxHAS_WORKING_GTK_DC_BLIT 1
 
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #define wxHAS_WORKING_GTK_DC_BLIT 1
 

+#undef HAVE_SYS_SELECT_H
+

 #endif /* __WX_SETUP_H__ */
 #endif /* __WX_SETUP_H__ */