X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c455ab932f89cc166fc38d3f2c2f942f6a130649..6c00e46fa83e3a9c0e76a76f15522a10b3a5c67f:/include/wx/msw/winundef.h?ds=sidebyside diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 4a56ddeb49..ac2fa36577 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -9,8 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +/* THIS SHOULD NOT BE USED since you might include it once e.g. in window.h, + * then again _AFTER_ you've included windows.h, in which case it won't work + * a 2nd time -- JACS #ifndef _WX_WINUNDEF_H_ #define _WX_WINUNDEF_H_ + */ // windows.h #defines the following identifiers which are also used in wxWin @@ -117,7 +121,7 @@ #ifdef StartDoc #undef StartDoc - #ifdef __MINGW32__ + #ifdef __GNUWIN32__ #define DOCINFOW DOCINFO #define DOCINFOA DOCINFO #endif @@ -196,4 +200,5 @@ // #undef GetNextChild //endif -#endif // _WX_WINUNDEF_H_ +// #endif // _WX_WINUNDEF_H_ +