Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-10-03 07:41:33 +00:00
parent 1c68fb912d
commit 659d096cea
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/defs.h
View File

@@ -224,8 +224,13 @@
#include "wx/setup.h" #include "wx/setup.h"
// just in case they were defined in 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 // this has to be done after including setup.h which might
// define __HPUX__ 1 itself // define __HPUX__ 1 itself
@@ -1808,7 +1813,7 @@ typedef void * WXLPCREATESTRUCT;
typedef unsigned long WXMPARAM; typedef unsigned long WXMPARAM;
typedef unsigned long WXMSGID; typedef unsigned long WXMSGID;
typedef void* WXRESULT; typedef void* WXRESULT;
typedef int (*WXFARPROC)(); //typedef int (*WXFARPROC)();
// some windows handles not defined by PM // some windows handles not defined by PM
typedef unsigned long HANDLE; typedef unsigned long HANDLE;
typedef unsigned long HICON; typedef unsigned long HICON;

2
src/common/filefn.cpp
View File

@@ -99,7 +99,7 @@
#endif #endif
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include "windows.h" #include <windows.h>
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------