avoiding warning because of missing define

[wxWidgets.git] / tests / streams / largefile.cpp

diff --git a/tests/streams/largefile.cpp b/tests/streams/largefile.cpp
index 4443ba7809d14b7cfdf147f52a3fc254ef9744a7..af65d4e17e3e90ea06ff9a143cbf7afaf60a88e1 100644 (file)
--- a/tests/streams/largefile.cpp
+++ b/tests/streams/largefile.cpp
@@ -8,7 +8,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 //
-// Were interested in what happens around offsets 0x7fffffff and 0xffffffff
+// We're interested in what happens around offsets 0x7fffffff and 0xffffffff
 // so the test writes a small chunk of test data just before and just after
 // these offsets, then reads them back.
 //
@@ -36,7 +36,8 @@
 #include "wx/wfstream.h"
 
 #ifdef __WXMSW__
-#include "winioctl.h"
+#include "wx/msw/wrapwin.h"
+#include <winioctl.h>
 #endif
 
 using std::auto_ptr;
@@ -255,7 +256,7 @@ wxOutputStream *LargeFileTest_wxFFile::MakeOutStream(const wxString& name) const
 
 bool LargeFileTest_wxFFile::HasLFS() const
 {
-#if HAVE_FSEEKO
+#ifdef HAVE_FSEEKO
     return (wxFileOffset)0xffffffff > 0;
 #else
     return false;
@@ -292,9 +293,9 @@ 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.
 //
-// On unix most filesystems support sparse files, so right now I'm just
-// assuming sparse file support on unix. On Windows it's possible to test, and
-// sparse files should be available on Win 5+ with NTFS.
+// On unix, most filesystems support sparse files, though not all. So for now
+// I'm not assuming sparse file support on unix. On Windows it's possible to
+// test, and sparse files should be available on Win 5+ with NTFS.
 
 #ifdef __WXMSW__
 
@@ -336,7 +337,8 @@ void GetVolumeInfo(const wxString& path)
     }
 
     // NULL means the current volume
-    const wxChar *pVol = vol.empty() ? NULL : vol.c_str();
+    const wxChar *pVol = vol.empty() ? (const wxChar *)NULL
+                                     : vol.c_str();
 
     if (!::GetVolumeInformation(pVol, NULL, 0, NULL, NULL,
                                 &volumeFlags, 
@@ -365,7 +367,7 @@ void MakeSparse(const wxString& path, int fd)
         if (!::DeviceIoControl((HANDLE)_get_osfhandle(fd),
                                FSCTL_SET_SPARSE,
                                NULL, 0, NULL, 0, &cb, NULL))
-            volumeFlags &= ~ FILE_SUPPORTS_SPARSE_FILES;
+            volumeFlags &= ~FILE_SUPPORTS_SPARSE_FILES;
 }
 
 CppUnit::Test* GetlargeFileSuite()
@@ -388,11 +390,7 @@ CppUnit::Test* GetlargeFileSuite()
 bool IsFAT(const wxString& WXUNUSED(path)) { return false; }
 void MakeSparse(const wxString& WXUNUSED(path), int WXUNUSED(fd)) { }
 
-#ifdef __UNIX__
-CppUnit::Test* GetlargeFileSuite() { return largeFile::suite(); }
-#else
 CppUnit::Test* GetlargeFileSuite() { return NULL; }
-#endif
 
 #endif // __WXMSW__