Use __WINDOWS__ for OS checks and __WXMSW__ for GUI checks (round 2).
This is continuation of r70796 and serves the same purpose. Closes #14065, #14066. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -35,7 +35,7 @@
|
||||
#include "wx/filename.h"
|
||||
#include "wx/wfstream.h"
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#ifdef __WINDOWS__
|
||||
#include "wx/msw/wrapwin.h"
|
||||
#ifdef __VISUALC__
|
||||
// 'nonstandard extension used : nameless struct/union' occurs inside
|
||||
@@ -305,7 +305,7 @@ CppUnit::Test *largeFile::suite()
|
||||
// are picked up. However this is only possible when sparse files are
|
||||
// supported otherwise the tests require too much disk space.
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#ifdef __WINDOWS__
|
||||
|
||||
#ifndef FILE_SUPPORTS_SPARSE_FILES
|
||||
#define FILE_SUPPORTS_SPARSE_FILES 0x00000040
|
||||
@@ -400,7 +400,7 @@ CppUnit::Test* GetlargeFileSuite()
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#else // __WXMSW__
|
||||
#else // __WINDOWS__
|
||||
|
||||
bool IsFAT(const wxString& WXUNUSED(path)) { return false; }
|
||||
void MakeSparse(const wxString& WXUNUSED(path), int WXUNUSED(fd)) { }
|
||||
@@ -436,7 +436,7 @@ CppUnit::Test* GetlargeFileSuite()
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif // __WXMSW__
|
||||
#endif // __WINDOWS__
|
||||
|
||||
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(largeFile, "largeFile");
|
||||
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(largeFile, "Streams.largeFile");
|
||||
|
Reference in New Issue
Block a user