Fixed a multiple define problem for strnicmp and stricmp by using the definition from utils.h if compiling for wx2

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

include/wx/db.h

@@ -75,15 +75,19 @@
 	#include <sqlext.h>
 #endif
 
-#ifdef __UNIX__
+#if wxMAJOR_VERSION == 2
-#   ifndef strnicmp 
+	#include "utils.h"
-#      define strnicmp strncasecmp 
+#else
-#   endif 
+	#ifdef __UNIX__
-#   ifndef stricmp 
+	#   ifndef strnicmp 
-#      define stricmp strcasecmp 
+	#      define strnicmp strncasecmp 
-#   endif 
+	#   endif 
-#else 
+	#   ifndef stricmp 
-#   include <io.h> 
+	#      define stricmp strcasecmp 
+	#   endif 
+	#else 
+	#   include <io.h> 
+	#endif
 #endif
 
 enum		enumDummy		{enumDum1};