From: Václav Slavík Date: Wed, 20 Aug 2008 21:35:55 +0000 (+0000) Subject: re-fix MinGW DLL compilation X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fda71b397a368f4b36a73a387c58ade2c928d9db?hp=c58d22381aaeece1c27c1d9061061ed68f269ae3 re-fix MinGW DLL compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- 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() {