X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c09451870888f9c774f86d9a34ac348d41d2da9..e48df5d353610b4b2d91c5dbb4ffdf97f1aa4253:/tests/streams/largefile.cpp

diff --git a/tests/streams/largefile.cpp b/tests/streams/largefile.cpp
index 8a11a3bf82..af65d4e17e 100644
--- a/tests/streams/largefile.cpp
+++ b/tests/streams/largefile.cpp
@@ -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;
@@ -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,