projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
using CLSCTX_ALL fails with Microsoft Office applications, correct the last change...
[wxWidgets.git]
/
tests
/
streams
/
largefile.cpp
diff --git
a/tests/streams/largefile.cpp
b/tests/streams/largefile.cpp
index 1366ae6091bbbea9683ab4d36bf1184c9e374850..af65d4e17e3e90ea06ff9a143cbf7afaf60a88e1 100644
(file)
--- a/
tests/streams/largefile.cpp
+++ b/
tests/streams/largefile.cpp
@@
-337,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,