Committing in .

 OpenVMS updates

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/include/wx/defs.h
 ----------------------------------------------------------------------

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f1fe077816eb6e5c698d7cce371c00946e246510..06cc68c76665650c05f4f0861bcc2f1148f6d1b5 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -711,7 +711,7 @@ typedef wxUint32 wxDword;
     #define wxLongLongSuffix l
     #define wxLongLongFmtSpec _T("l")
     #define wxLongLongIsLong
     #define wxLongLongSuffix l
     #define wxLongLongFmtSpec _T("l")
     #define wxLongLongIsLong

-#elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ ) 
+#elif (defined(__VISUALC__) && defined(__WIN32__)) 

     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
     #define wxLongLongFmtSpec _T("I64")
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
     #define wxLongLongFmtSpec _T("I64")

diff --git a/setup.h_vms b/setup.h_vms
index e85b6d24c4cd8159f1e081d931873e258b93515e..33f1126a262aef24a206b38fb190d4ea078d793c 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -803,6 +803,10 @@
  * Use MS HTML Help controller (win32)
  */
 #define wxUSE_MS_HTML_HELP 0
  * Use MS HTML Help controller (win32)
  */
 #define wxUSE_MS_HTML_HELP 0

+/*
+ * Use MS HTML Help via libmspack (Unix)
+ */
+#define wxUSE_LIBMSPACK 1

 
 /*
  * Use iostream.h rather than iostream
 
 /*
  * Use iostream.h rather than iostream