use int instead of SOCKET to avoid including winsock.h from wx/gsocket.h

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index c4b8bf93ec1796feea5c031b90e690871b8efd7d..7de7bf7acd587b1f43b0958b63e2f5ae59b5f8c9 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 : 5 March 2008                                                       *
+ * Date : 12 September 2008                                                  *

  *                                                                           *
  *****************************************************************************/
 
  *                                                                           *
  *****************************************************************************/
 


@@ -210,14 +210,12 @@ typedef pid_t GPid;
 
 #define wxUSE_LOGGUI 1
 
 
 #define wxUSE_LOGGUI 1
 

-#define wxUSE_LOG_DIALOG 0
+#define wxUSE_LOG_DIALOG 1

 
 #define wxUSE_CMDLINE_PARSER 1
 
 #define wxUSE_THREADS 1
 
 
 #define wxUSE_CMDLINE_PARSER 1
 
 #define wxUSE_THREADS 1
 

-#define wxUSE_WEAKREF 1
-

 #define wxUSE_STREAMS       1
 
 #if defined(__DMC__) || defined(__WATCOMC__) \
 #define wxUSE_STREAMS       1
 
 #if defined(__DMC__) || defined(__WATCOMC__) \


@@ -237,7 +235,7 @@ typedef pid_t GPid;
 
 #define wxUSE_BASE64        1
 
 
 #define wxUSE_BASE64        1
 

-#define wxUSE_CONSOLE_EVENTLOOP 0
+#define wxUSE_CONSOLE_EVENTLOOP 1

 
 #define wxUSE_FILE          1
 #define wxUSE_FFILE         1
 
 #define wxUSE_FILE          1
 #define wxUSE_FFILE         1


@@ -330,6 +328,8 @@ typedef pid_t GPid;
 
 #define wxUSE_AUI       1
 
 
 #define wxUSE_AUI       1
 

+#define wxUSE_PROPGRID  1
+

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


@@ -636,31 +636,11 @@ typedef pid_t GPid;
 
 /* --- end MSW options --- */
 
 
 /* --- end MSW options --- */
 

-/*
- * Supports bool type
- */
-#define HAVE_BOOL
-

 /*
  * Define if your compiler supports the explicit keyword
  */
 #define HAVE_EXPLICIT 1
 
 /*
  * Define if your compiler supports the explicit keyword
  */
 #define HAVE_EXPLICIT 1
 

-/*
- * Define if your compiler supports const_cast<>()
- */
-#define HAVE_CONST_CAST 1
-
-/*
- * Define if your compiler supports reinterpret_cast<>()
- */
-#define HAVE_REINTERPRET_CAST 1
-
-/*
- * Define if your compiler supports const_cast<>()
- */
-#define HAVE_STATIC_CAST 1
-

 /*
  * Define if your compiler has C99 va_copy
  */
 /*
  * Define if your compiler has C99 va_copy
  */


@@ -713,6 +693,26 @@ typedef pid_t GPid;
  */
 #undef HAVE_GNU_CXX_HASH_MAP
 
  */
 #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.
  */
 /*
  * Define if the compiler supports simple visibility declarations.
  */


@@ -776,6 +776,11 @@ typedef pid_t GPid;
  */
 #define wxHAVE_PTHREAD_CLEANUP 1
 
  */
 #define wxHAVE_PTHREAD_CLEANUP 1
 

+/*
+ * Define if compiler has __thread keyword.
+ */
+#undef HAVE___THREAD_KEYWORD
+

 /* compatibility */
 /*
  * Use OpenGL
 /* compatibility */
 /*
  * Use OpenGL


@@ -976,6 +981,12 @@ typedef pid_t GPid;
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_VSNPRINTF_DECL
 
  * 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
 
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 


@@ -1244,5 +1255,6 @@ typedef pid_t GPid;
 
 #undef HAVE_SYS_SELECT_H
 
 
 #undef HAVE_SYS_SELECT_H
 

+#define __VMS_BROKEN_TEMPLATES

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