Fixed a multiple define problem for strnicmp and stricmp by using the definition...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/db.h b/include/wx/db.h
index c624086c265f5f26356fb374a851c322f47b9604..200fec58b406b3af68217569b582f89fcb98db01 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -75,15 +75,19 @@
        #include <sqlext.h>
 #endif
 
-#ifdef __UNIX__
-#   ifndef strnicmp 
-#      define strnicmp strncasecmp 
-#   endif 
-#   ifndef stricmp 
-#      define stricmp strcasecmp 
-#   endif 
-#else 
-#   include <io.h> 
+#if wxMAJOR_VERSION == 2
+       #include "utils.h"
+#else
+       #ifdef __UNIX__
+       #   ifndef strnicmp 
+       #      define strnicmp strncasecmp 
+       #   endif 
+       #   ifndef stricmp 
+       #      define stricmp strcasecmp 
+       #   endif 
+       #else 
+       #   include <io.h> 
+       #endif
 #endif
 
 enum           enumDummy               {enumDum1};