From fda71b397a368f4b36a73a387c58ade2c928d9db Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm> Date: Wed, 20 Aug 2008 21:35:55 +0000 Subject: [PATCH] re-fix MinGW DLL compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/buffer.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/wx/buffer.h b/include/wx/buffer.h index e0de6088e8..3244323737 100644 --- a/include/wx/buffer.h +++ b/include/wx/buffer.h @@ -168,7 +168,14 @@ private: // placeholder for NULL string, to simplify this code // NB: this is defined in string.cpp, not (non-existent) buffer.cpp +#ifdef __MINGW32__ + // MinGW requires explicit WXDLLIMPEXP_DATA_BASE to avoid compilation + // errors + static WXDLLIMPEXP_DATA_BASE(Data) NullData; +#else + // but Visual C++ doesn't like it static Data NullData; +#endif void IncRef() { -- 2.47.2