]> git.saurik.com Git - wxWidgets.git/commitdiff
re-fix MinGW DLL compilation
authorVáclav Slavík <vslavik@fastmail.fm>
Wed, 20 Aug 2008 21:35:55 +0000 (21:35 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Wed, 20 Aug 2008 21:35:55 +0000 (21:35 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/buffer.h

index e0de6088e8cf534ee2fd724df0bf77585b6134f8..32443237373ac92b4429d53f69cfe227f3dac051 100644 (file)
@@ -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()
     {