_MSC_VER change fixes - now compiles again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ec4768ef9a
commit
858f7d6641
@ -57,7 +57,7 @@
|
||||
// define another standard symbol for Microsoft Visual C++: the standard one
|
||||
// (_MSC_VER) is also defined by Metrowerks compiler
|
||||
#if defined(_MSC_VER) && !defined(__MWERKS__)
|
||||
#define __VISUALC__
|
||||
#define __VISUALC__ _MSC_VER
|
||||
#elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
|
||||
#define __BORLANDC__
|
||||
#elif defined(__WATCOMC__)
|
||||
|
@ -34,6 +34,7 @@ class WXDLLEXPORT wxObject;
|
||||
|
||||
class WXDLLEXPORT wxClassInfo;
|
||||
class WXDLLEXPORT wxInputStream;
|
||||
class WXDLLEXPORT wxOutputStream;
|
||||
class WXDLLEXPORT wxObjectInputStream;
|
||||
class WXDLLEXPORT wxObjectOutputStream;
|
||||
class WXDLLEXPORT wxHashTable;
|
||||
|
@ -9,6 +9,9 @@
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "wx/setup.h" // always include this file (under Unix it's generated by configure)
|
||||
#include "wx/defs.h" // compiler definitions
|
||||
|
||||
// check if to use precompiled headers
|
||||
#if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)
|
||||
#if !NOPCH
|
||||
@ -63,8 +66,5 @@
|
||||
#undef LoadAccelerators
|
||||
#endif
|
||||
|
||||
#else
|
||||
// always include this file (under Unix it's generated by configure)
|
||||
#include "wx/setup.h"
|
||||
#endif
|
||||
#endif // WX_PRECOMP
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user