From: George Tasker Date: Mon, 8 Nov 1999 01:17:24 +0000 (+0000) Subject: wxStrnicmp() function is not defined under windows, so I've provided a workaround... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/aa33452c949f27fb1f7b7bcdc26d82ceb6aa453a wxStrnicmp() function is not defined under windows, so I've provided a workaround that does not require that function. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/db.cpp b/src/common/db.cpp index 3842b2cb11..c356007e1f 100644 --- a/src/common/db.cpp +++ b/src/common/db.cpp @@ -63,6 +63,7 @@ #include "wx/msgdlg.h" #endif #include "wx/filefn.h" + #include "wx/wxchar.h" #endif #if wxMAJOR_VERSION == 1 @@ -1706,7 +1707,12 @@ bool wxDB::WriteSqlLog(char *logMsg) */ DBMS wxDB::Dbms(void) { - if (!wxStrnicmp(dbInf.dbmsName,"Oracle",6)) + wxChar baseName[20]; + + wxStrncpy(baseName,dbInf.dbmsName,6); + baseName[6] = 0; +// if (!wxStrnicmp(dbInf.dbmsName,"Oracle",6)) + if (!wxStricmp(baseName,"Oracle")) return(dbmsORACLE); if (!wxStricmp(dbInf.dbmsName,"Adaptive Server Anywhere")) return(dbmsSYBASE_ASA); @@ -1720,7 +1726,10 @@ DBMS wxDB::Dbms(void) return(dbmsPOSTGRES); if (!wxStricmp(dbInf.dbmsName,"ACCESS")) return(dbmsACCESS); - if (!wxStrnicmp(dbInf.dbmsName,"DBASE",5)) + wxStrncpy(baseName,dbInf.dbmsName,5); + baseName[5] = 0; +// if (!wxStrnicmp(dbInf.dbmsName,"DBASE",5)) + if (!wxStricmp(baseName,"DBASE")) return(dbmsDBASE); return(dbmsUNIDENTIFIED);