compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
25d7c7e89c
commit
ddd94f80a7
@ -88,27 +88,7 @@
|
||||
#define TEST_WCHAR
|
||||
#define TEST_ZIP
|
||||
#else // #if TEST_ALL
|
||||
<<<<<<< console.cpp
|
||||
<<<<<<< console.cpp
|
||||
<<<<<<< console.cpp
|
||||
<<<<<<< console.cpp
|
||||
<<<<<<< console.cpp
|
||||
#define TEST_MIME
|
||||
=======
|
||||
#define TEST_STDPATHS
|
||||
>>>>>>> 1.197
|
||||
=======
|
||||
#define TEST_MODULE
|
||||
>>>>>>> 1.199
|
||||
=======
|
||||
#define TEST_INFO_FUNCTIONS
|
||||
>>>>>>> 1.201
|
||||
=======
|
||||
#define TEST_STDPATHS
|
||||
>>>>>>> 1.203
|
||||
=======
|
||||
#define TEST_FILE
|
||||
>>>>>>> 1.204
|
||||
#endif
|
||||
|
||||
// some tests are interactive, define this to run them
|
||||
|
Loading…
Reference in New Issue
Block a user