Cleanup of previous fix

[wxWidgets.git] / include / wx / buffer.h

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index e0de6088e8cf534ee2fd724df0bf77585b6134f8..32443237373ac92b4429d53f69cfe227f3dac051 100644 (file)
--- 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()
     {