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
This commit is contained in:
parent
1c68fb912d
commit
659d096cea
@ -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;
|
||||
|
@ -99,7 +99,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#include "windows.h"
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user