From: Jouk Jansen <joukj@hrem.nano.tudelft.nl>
Date: Thu, 27 Sep 2007 08:09:44 +0000 (+0000)
Subject: git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48961 c3d73ce0-8a6f... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b69376969237980cf240d34ce02199d508afb688?ds=inline

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 8bdae42935..afc1f82415 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -591,6 +591,15 @@
 #    define wxSTD
 #endif
 
+/* On OpenVMS with the most recent HP C++ compiler some function (i.e. wscanf)
+ * are only available in the std-namespace. (BUG???)
+ */
+#if defined(  __VMS ) && (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
+# define wxVMS_USE_STD std::
+#else
+# define wxVMS_USE_STD
+#endif
+
 /* Choose which method we will use for updating menus
  * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
diff --git a/include/wx/wxcrtvararg.h b/include/wx/wxcrtvararg.h
index 9a9aa4cc5a..2e7cf5a505 100644
--- a/include/wx/wxcrtvararg.h
+++ b/include/wx/wxcrtvararg.h
@@ -225,24 +225,10 @@
     int wxCRT_FscanfW(FILE *stream, const wchar_t *format, ...);
     int wxCRT_VsscanfW(const wchar_t *str, const wchar_t *format, va_list ap);
 #else
-#ifdef __VMS
-#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
-# define wxCRT_ScanfW     std::wscanf
-# define wxCRT_SscanfW    std::swscanf
-# define wxCRT_FscanfW    std::fwscanf
-# define wxCRT_VsscanfW   std::vswscanf
-#else
-    #define wxCRT_ScanfW     wscanf
-    #define wxCRT_SscanfW    swscanf
-    #define wxCRT_FscanfW    fwscanf
-    #define wxCRT_VsscanfW   vswscanf
-#endif
-#else
-    #define wxCRT_ScanfW     wscanf
-    #define wxCRT_SscanfW    swscanf
-    #define wxCRT_FscanfW    fwscanf
-    #define wxCRT_VsscanfW   vswscanf
-#endif
+    #define wxCRT_ScanfW     wxVMS_USE_STD wscanf
+    #define wxCRT_SscanfW    wxVMS_USE_STD swscanf
+    #define wxCRT_FscanfW    wxVMS_USE_STD fwscanf
+    #define wxCRT_VsscanfW   wxVMS_USE_STD vswscanf
 #endif
 
 // ----------------------------------------------------------------------------