From 659d096cea6ae59cc57758ee239f5ddf0181e7bc Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 3 Oct 2000 07:41:33 +0000 Subject: [PATCH] Small fixes to defs.h; change "windows.h" to in filefn.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 7 ++++++- src/common/filefn.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 17aa3cd4d1..b850a396d0 100644 --- 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 +#ifdef PACKAGE #undef PACKAGE +#endif + +#ifdef VERSION #undef VERSION +#endif // 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 int (*WXFARPROC)(); +//typedef int (*WXFARPROC)(); // 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 4adda91470..947c3dfff7 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -99,7 +99,7 @@ #endif #ifdef __WINDOWS__ - #include "windows.h" + #include #endif // ---------------------------------------------------------------------------- -- 2.45.2