projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't lock the gs_prevCS critical section recursively (replaces patch 1857581)
[wxWidgets.git]
/
include
/
wx
/
ioswrap.h
diff --git
a/include/wx/ioswrap.h
b/include/wx/ioswrap.h
index 518f6b7ee2e219afe8db6c65d84b8313e6ce2b2f..72dee5bbaaca7107389c101f691049dd83466bed 100644
(file)
--- a/
include/wx/ioswrap.h
+++ b/
include/wx/ioswrap.h
@@
-6,17
+6,25
@@
// Created: 03.02.99
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Created: 03.02.99
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
///////////////////////////////////////////////////////////////////////////////
#if wxUSE_STD_IOSTREAM
///////////////////////////////////////////////////////////////////////////////
#if wxUSE_STD_IOSTREAM
+#include "wx/beforestd.h"
+
#if wxUSE_IOSTREAMH
# include <iostream.h>
#else
# include <iostream>
#endif
#if wxUSE_IOSTREAMH
# include <iostream.h>
#else
# include <iostream>
#endif
+#include "wx/afterstd.h"
+
+#ifdef __WXMSW__
+# include "wx/msw/winundef.h"
+#endif
+
#endif
// wxUSE_STD_IOSTREAM
#endif
// wxUSE_STD_IOSTREAM