X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b68671575b443f109af6e930ad72a063205a5c2..c797aec4b941dcf288398dc1f132744ebe840817:/tests/streams/largefile.cpp diff --git a/tests/streams/largefile.cpp b/tests/streams/largefile.cpp index 1366ae6091..f61d2943d1 100644 --- a/tests/streams/largefile.cpp +++ b/tests/streams/largefile.cpp @@ -36,8 +36,20 @@ #include "wx/wfstream.h" #ifdef __WXMSW__ -#include "wx/msw/wrapwin.h" -#include + #include "wx/msw/wrapwin.h" + #ifdef __VISUALC__ + // 'nonstandard extension used : nameless struct/union' occurs inside + // winioctl.h + #pragma warning(disable:4201) + #endif + #include + #ifdef __VISUALC__ + #pragma warning(default:4201) + #endif +#endif + +#ifdef __VISUALC__ + #define fileno _fileno #endif using std::auto_ptr; @@ -337,7 +349,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,