From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 24 Nov 2001 12:58:09 +0000 (+0000)
Subject: Include windows.h before sql headers, if compiling with VC++. Otherwise, for files
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d96083979d47557ff385cb67fe936e10b61313fc

Include windows.h before sql headers, if compiling with VC++. Otherwise, for files
that don't use wxprec.h (non-sample/demo files), windows.h may not have been included,
and sqltypes.h will fail to compile.


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

diff --git a/include/wx/db.h b/include/wx/db.h
index 57ec4345f7..cc2c1d84e8 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -59,6 +59,16 @@
 
 extern "C" {
 #ifdef __VISUALC__
+// include standard Windows headers
+#if defined(__WXMSW__) && !wxUSE_MFC
+    #ifndef STRICT
+        #define STRICT 1
+    #endif
+
+    #include <windows.h>
+    #include "wx/msw/winundef.h"
+#endif
+
 // If you use the wxDbCreateDataSource() function with MSW/VC6,
 // you cannot use the iODBC headers, you must use the VC headers,
 // plus the odbcinst.h header - gt Nov 2 2000