fix loading ICO from socket stream: override OnSysTell and OnSysSeek rather than...

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

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 3bc11f06555c41b22b9faf5f1254410c3a69636e..a9e6f86f0473f53bc5f32b2f79cf690b968cd4a8 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -97,7 +97,7 @@ public:
 // FIXME-VC6: currently it's only not defined for VC6 in DLL build as it
 //            doesn't export template methods from DLL correctly so even though
 //            it compiles them fine, we get link errors when using wxArrayString
 // FIXME-VC6: currently it's only not defined for VC6 in DLL build as it
 //            doesn't export template methods from DLL correctly so even though
 //            it compiles them fine, we get link errors when using wxArrayString

-#if !defined(__VISUALC6__) || !(defined(WXMAKINGDLL || defined(WXUSINGDLL)))
+#if !defined(__VISUALC6__) || !(defined(WXMAKINGDLL) || defined(WXUSINGDLL))

     #define wxHAS_VECTOR_TEMPLATE_ASSIGN
 #endif
 
     #define wxHAS_VECTOR_TEMPLATE_ASSIGN
 #endif