From e4a330f1e5964271d38a007671298992786b77a9 Mon Sep 17 00:00:00 2001
From: George Tasker <gtasker@allenbrook.com>
Date: Sun, 7 Nov 1999 02:03:37 +0000
Subject: [PATCH] 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 | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/include/wx/db.h b/include/wx/db.h
index c624086c26..200fec58b4 100644
--- 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};
-- 
2.45.2