Reverting patch 1325857

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 07058d6eed7f8ce2e37c76adcef70b9d081f8915..1b5cd7fdf5934af47ddf56ed9a6a30b78b9f5bad 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -53,7 +53,7 @@
 #define HAVE_SSIZE_T 1
 
 /* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS
+#define STDC_HEADERS 1
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t
@@ -156,10 +156,10 @@
 #endif
 
 
-#define WXWIN_COMPATIBILITY_2_2 1
-
 #define WXWIN_COMPATIBILITY_2_4 1
 
+#define WXWIN_COMPATIBILITY_2_6 1
+
 #define wxDIALOG_UNIT_COMPATIBILITY   1
 
 
@@ -344,12 +344,15 @@
 
 #define wxUSE_CHOICEBOOK 1
 
+#define wxUSE_TREEBOOK 1
+
 #define wxUSE_TAB_DIALOG    1
 
 #define wxUSE_GRID         1
 
-#define wxUSE_MINIFRAME 1
+#define wxUSE_DATAVIEWCTRL   1
 
+#define wxUSE_MINIFRAME 1
 
 #define wxUSE_ACCEL 1
 
@@ -427,6 +430,7 @@
 
 #define wxUSE_GLCANVAS       1
 
+#define wxUSE_RICHTEXT       1
 
 #define wxUSE_CLIPBOARD     1
 
@@ -516,10 +520,8 @@
  * the common values automatically */
 #if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1
-#endif
-
-#if defined(__WXPM__)
-#define wxUSE_OWNER_DRAWN 1
+#else
+#define wxUSE_OWNER_DRAWN 0
 #endif
 
 /* enable rich edit under Win32 */
@@ -603,6 +605,11 @@
  * case WX_NO_REGEX_ADVANCED should be defined.
  */
 #undef WX_NO_REGEX_ADVANCED
+/*
+ * On GNU systems use re_search instead of regexec, since the latter does a
+ * strlen on the search text affecting the performance of some operations.
+ */
+#undef HAVE_RE_SEARCH
 /*
  * Use SDL for audio (Unix)
  */
@@ -611,6 +618,10 @@
  * Use GNOME print for printing under GTK+ 2.0
  */
 #define wxUSE_LIBGNOMEPRINT 0
+/*
+ * Use the Hildon framework
+ */
+#define wxUSE_LIBHILDON 0
 /*
  * Use iODBC
  */
@@ -804,6 +815,9 @@
 /* Define if you have the putenv function.  */
 #define HAVE_PUTENV 1
 
+/* Define if you have the readdir_r function.  */
+#undef HAVE_READDIR_R
+
 /* Define if you have the setenv function.  */
 #   if __CRTL_VER >= 70000000
 #define HAVE_SETENV 1
@@ -922,15 +936,58 @@
 /* Define if you have BSD flock() function. */
 #undef HAVE_FLOCK
 
+/* Define if you have getaddrinfo function. */
+#define HAVE_GETADDRINFO 1
+
+/* Define if you have a gethostbyname_r function taking 6 arguments. */
+#undef HAVE_FUNC_GETHOSTBYNAME_R_6
+
+/* Define if you have a gethostbyname_r function taking 5 arguments. */
+#undef HAVE_FUNC_GETHOSTBYNAME_R_5
+
+/* Define if you have a gethostbyname_r function taking 3 arguments. */
+#undef HAVE_FUNC_GETHOSTBYNAME_R_3
+
+/* Define if you only have a gethostbyname function */
+#define HAVE_GETHOSTBYNAME 1
+
 /* Define if you have the gethostname function.  */
 #define HAVE_GETHOSTNAME 1
 
+/* Define if you have a getservbyname_r function taking 6 arguments. */
+#undef HAVE_FUNC_GETSERVBYNAME_R_6
+
+/* Define if you have a getservbyname_r function taking 5 arguments. */
+#undef HAVE_FUNC_GETSERVBYNAME_R_5
+
+/* Define if you have a getservbyname_r function taking 4 arguments. */
+#undef HAVE_FUNC_GETSERVBYNAME_R_4
+
+/* Define if you only have a getservbyname function */
+#define HAVE_GETSERVBYNAME 1
+
+/* Define if you have the gmtime_r function.  */
+#if __CRTL_VER >= 70000000 && \
+    (defined _POSIX_C_SOURCE || !defined _ANSI_C_SOURCE)
+#define HAVE_GMTIME_R 1
+#else
+#undef HAVE_GMTIME_R
+#endif
+
 /* Define if you have the inet_addr function.  */
 #define HAVE_INET_ADDR 1
 
 /* Define if you have the inet_aton function.  */
 #define HAVE_INET_ATON 1
 
+/* Define if you have the localtime_r function.  */
+#if __CRTL_VER >= 70000000 && \
+    (defined _POSIX_C_SOURCE || !defined _ANSI_C_SOURCE)
+#define HAVE_LOCALTIME_R 1
+#else
+#undef HAVE_LOCALTIME_R
+#endif
+
 /* Define if you have the mktemp function.  */
 #define HAVE_MKTEMP 1
 
@@ -1091,8 +1148,6 @@
  *  by configure.
  */
 
-#include "wx/chkconf.h"
-
 /*
     define some constants identifying wxWindows version in more details t
     just the version number