Small fixes to defs.h; change "windows.h" to <windows.h> in filefn.cpp

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 17aa3cd4d1e35b6b662bbafd9121de9e717f4965..b850a396d0253990213d6e218102dc53cad23adc 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -224,8 +224,13 @@
 #include "wx/setup.h"
 
 // just in case they were defined in setup.h
 #include "wx/setup.h"
 
 // just in case they were defined in setup.h

+#ifdef PACKAGE

 #undef PACKAGE
 #undef PACKAGE

+#endif
+
+#ifdef VERSION

 #undef VERSION
 #undef VERSION

+#endif

 
 // this has to be done after including setup.h which might
 // define __HPUX__ 1 itself
 
 // this has to be done after including setup.h which might
 // define __HPUX__ 1 itself


@@ -1808,7 +1813,7 @@ typedef void *          WXLPCREATESTRUCT;
 typedef unsigned long   WXMPARAM;
 typedef unsigned long   WXMSGID;
 typedef void*           WXRESULT;
 typedef unsigned long   WXMPARAM;
 typedef unsigned long   WXMSGID;
 typedef void*           WXRESULT;

-typedef int             (*WXFARPROC)();
+//typedef int             (*WXFARPROC)();

 // some windows handles not defined by PM
 typedef unsigned long   HANDLE;
 typedef unsigned long   HICON;
 // some windows handles not defined by PM
 typedef unsigned long   HANDLE;
 typedef unsigned long   HICON;

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 4adda9147010291762f87cec893b441e47d71a7c..947c3dfff7fa4c6f4ce152321c484a82c50b58a2 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -99,7 +99,7 @@
 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__

-    #include "windows.h"
+    #include <windows.h>

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------