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
This commit is contained in:
@@ -63,6 +63,7 @@
|
|||||||
#include "wx/msgdlg.h"
|
#include "wx/msgdlg.h"
|
||||||
#endif
|
#endif
|
||||||
#include "wx/filefn.h"
|
#include "wx/filefn.h"
|
||||||
|
#include "wx/wxchar.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxMAJOR_VERSION == 1
|
#if wxMAJOR_VERSION == 1
|
||||||
@@ -1706,7 +1707,12 @@ bool wxDB::WriteSqlLog(char *logMsg)
|
|||||||
*/
|
*/
|
||||||
DBMS wxDB::Dbms(void)
|
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);
|
return(dbmsORACLE);
|
||||||
if (!wxStricmp(dbInf.dbmsName,"Adaptive Server Anywhere"))
|
if (!wxStricmp(dbInf.dbmsName,"Adaptive Server Anywhere"))
|
||||||
return(dbmsSYBASE_ASA);
|
return(dbmsSYBASE_ASA);
|
||||||
@@ -1720,7 +1726,10 @@ DBMS wxDB::Dbms(void)
|
|||||||
return(dbmsPOSTGRES);
|
return(dbmsPOSTGRES);
|
||||||
if (!wxStricmp(dbInf.dbmsName,"ACCESS"))
|
if (!wxStricmp(dbInf.dbmsName,"ACCESS"))
|
||||||
return(dbmsACCESS);
|
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(dbmsDBASE);
|
||||||
return(dbmsUNIDENTIFIED);
|
return(dbmsUNIDENTIFIED);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user