From 4b4e81ee65f1448c8c467a3107eadb80c15bf3bc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 21 Sep 2007 11:34:19 +0000
Subject: [PATCH] include vms_jackets.h directly from wx/platform.h instead of
 doing it before wx/wxprec.h as this breaks PCH usage

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/platform.h | 10 +++++++++-
 src/gtk/app.cpp       | 10 ++--------
 src/gtk1/app.cpp      |  6 ------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 2c1a40d943..8bdae42935 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -20,7 +20,15 @@
     are included
 */
 #ifdef __MWERKS__
-#    include <stddef.h>
+#   include <stddef.h>
+#endif
+
+/*
+    This header must be included before anything else under VMS
+ */
+#ifdef __VMS
+#   include <vms_jackets.h>
+#   undef ConnectionNumber
 #endif
 
 /*
diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 33cf2dc6a0..e23081e0cc 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -7,12 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __VMS
-// vms_jackets.h should for proper working be included before anything else
-# include <vms_jackets.h>
-#undef ConnectionNumber
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -400,10 +394,10 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
 
 
     bool init_result;
+    int i;
 
 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert
-    int i;
     char **argvGTK = new char *[argc_ + 1];
     for ( i = 0; i < argc_; i++ )
     {
@@ -463,7 +457,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
         wxArrayString opt, desc;
         m_traits->GetStandardCmdLineOptions(opt, desc);
 
-        for ( int i = 0; i < argc_; i++ )
+        for ( i = 0; i < argc_; i++ )
         {
             // leave just the names of the options with values
             const wxString str = wxString(argv_[i]).BeforeFirst('=');
diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 6c57967a5f..e0d50295b0 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -7,12 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __VMS
-// vms_jackets.h should for proper working be included before anything else
-# include <vms_jackets.h>
-#undef ConnectionNumber
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-- 
2.45.2