Compilation fix for gcc-4 and newer.

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index b72ba72455f794e61bfd9ef441166458575502b9..2cc1868ba0f9fcee80639ce039ce5cdea6c230dc 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 September 2007                                                   *
+ * Date : 12 September 2008                                                  *
  *                                                                           *
  *****************************************************************************/
 
@@ -82,9 +82,6 @@
 #ifdef VMS_GTK2
 #define __WXGTK20__ 1
 
-/* Define this if your version of GTK+ is greater than 2.4 */
-#define __WXGTK24__ 1
-
 /* Define this if your version of GTK+ is greater than 2.6 */
 #define __WXGTK26__ 1
 
@@ -191,7 +188,7 @@ typedef pid_t GPid;
 
 
 #ifndef wxUSE_UNICODE
-#if defined( __WXX11__ )
+#if defined( __WXX11__ ) || defined ( __WXMOTIF__ )
     #define wxUSE_UNICODE 0
 #else
     #define wxUSE_UNICODE 1
@@ -213,7 +210,7 @@ typedef pid_t GPid;
 
 #define wxUSE_LOGGUI 1
 
-#define wxUSE_LOG_DIALOG 0
+#define wxUSE_LOG_DIALOG 1
 
 #define wxUSE_CMDLINE_PARSER 1
 
@@ -221,22 +218,24 @@ typedef pid_t GPid;
 
 #define wxUSE_STREAMS       1
 
-#define wxUSE_STD_IOSTREAM  0
-
 #if defined(__DMC__) || defined(__WATCOMC__) \
-     || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_STRING  0
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_DEFAULT  0  
 #else
-    #define wxUSE_STD_STRING  0
+    #define wxUSE_STD_DEFAULT  0
 #endif
 
+#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
+
+#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
+
 #define wxUSE_PRINTF_POS_PARAMS 0
 
 #define wxUSE_LONGLONG      1
 
 #define wxUSE_BASE64        1
 
-#define wxUSE_CONSOLE_EVENTLOOP 0
+#define wxUSE_CONSOLE_EVENTLOOP 1
 
 #define wxUSE_FILE          1
 #define wxUSE_FFILE         1
@@ -252,6 +251,8 @@ typedef pid_t GPid;
 #define wxUSE_INTL          1
 #include <locale.h>
 
+#define wxUSE_XLOCALE 1
+
 #define wxUSE_DATETIME      1
 
 #define wxUSE_TIMER         1
@@ -271,6 +272,8 @@ typedef pid_t GPid;
 #define wxUSE_SOCKETS       1
 #include <socket.h>
 
+#define wxUSE_IPV6          0
+
 #define wxUSE_FILESYSTEM    1
 
 #define wxUSE_FS_ZIP        1
@@ -325,6 +328,8 @@ typedef pid_t GPid;
 
 #define wxUSE_AUI       1
 
+#define wxUSE_PROPGRID  1
+
 #ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
 #endif
@@ -426,6 +431,8 @@ typedef pid_t GPid;
 
 #define wxUSE_MENUS         1
 
+#define wxUSE_NOTIFICATION_MESSAGE 1
+
 #define wxUSE_SASH          1
 
 #define wxUSE_SPLITTER      1
@@ -438,6 +445,11 @@ typedef pid_t GPid;
 
 #define wxUSE_VALIDATORS 1
 
+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 0
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif
 
 #define wxUSE_COMMON_DIALOGS 1
 
@@ -532,13 +544,6 @@ typedef pid_t GPid;
 
 #define wxUSE_SVG 1
 
-#define wxUSE_ODBC          1
-
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
-
 #define REMOVE_UNUSED_ARG   1
 
 #define wxUSE_IOSTREAMH     1
@@ -615,6 +620,8 @@ typedef pid_t GPid;
 
 #define wxUSE_OWNER_DRAWN 0
 
+#define wxUSE_TASKBARICON_BALLOONS 0
+
 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0
@@ -627,10 +634,6 @@ typedef pid_t GPid;
 
 #define wxUSE_CRASHREPORT 0
 
-
-
-#define wxUSE_BITMAP_MESSAGE         0
-
 /* --- end MSW options --- */
 
 /*
@@ -710,6 +713,26 @@ typedef pid_t GPid;
  */
 #undef HAVE_GNU_CXX_HASH_MAP
 
+/*
+ * Define if your compiler has std::unordered_map
+ */
+#undef HAVE_STD_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::unordered_set
+ */
+#undef HAVE_STD_UNORDERED_SET
+
+/*
+ * Define if your compiler has std::tr1::unordered_map
+ */
+#undef HAVE_TR1_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::tr1::unordered_set
+ */
+#undef HAVE_TR1_UNORDERED_SET
+
 /*
  * Define if the compiler supports simple visibility declarations.
  */
@@ -760,10 +783,6 @@ typedef pid_t GPid;
  * Use the Hildon framework
  */
 #define wxUSE_LIBHILDON 0
-/*
- * Use iODBC
- */
-#define wxUSE_BUILTIN_IODBC 0
 /*
  * Have glibc2
  */
@@ -777,6 +796,11 @@ typedef pid_t GPid;
  */
 #define wxHAVE_PTHREAD_CLEANUP 1
 
+/*
+ * Define if compiler has __thread keyword.
+ */
+#undef HAVE___THREAD_KEYWORD
+
 /* compatibility */
 /*
  * Use OpenGL
@@ -977,6 +1001,12 @@ typedef pid_t GPid;
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_VSNPRINTF_DECL
 
+/* Define if you have vsscanf() */
+#define HAVE_VSSCANF 1
+
+/* Define if you have vsscanf() declaration in the header */
+#define HAVE_VSSCANF_DECL 1
+
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 
@@ -1191,9 +1221,6 @@ typedef pid_t GPid;
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
 #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 
-/* Define if gtk_icon_size_lookup is missing from the GTK+ headers */
-#undef NEED_GTK_ICON_SIZE_LOOKUP
-
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
@@ -1209,6 +1236,9 @@ typedef pid_t GPid;
 /* Define if getgrgid_r is available. */
 #undef HAVE_GETGRGID_R
 
+/* Define if locale_t is available */
+#undef HAVE_LOCALE_T
+
 /* ---------------------------------------------------------------------
    Win32 adjustments section
    ---------------------------------------------------------------------
@@ -1245,4 +1275,6 @@ typedef pid_t GPid;
 
 #undef HAVE_SYS_SELECT_H
 
+#define __VMS_BROKEN_TEMPLATES
+
 #endif /* __WX_SETUP_H__ */