From f4ac41806af5766199a7d526a7becbcb8a0f5ab3 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Thu, 17 May 2012 23:20:47 +0200 Subject: [PATCH] use _strnicmp (ISO C++) instead of deprecated strnicmp (POSIX) and add missing "#define strncasecmp _strnicmp" in init.cpp --- src/init.cpp | 2 +- src/qt/bitcoin.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index b027a53d81..15eb883ac9 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -16,6 +16,7 @@ #ifndef WIN32 #include +#define strncasecmp _strnicmp #endif using namespace std; @@ -162,7 +163,6 @@ bool static InitError(const std::string &str) { ThreadSafeMessageBox(str, _("Bitcoin"), wxOK | wxMODAL); return false; - } bool static InitWarning(const std::string &str) diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 9452f7e1e3..528c68b1fc 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -33,6 +33,10 @@ Q_IMPORT_PLUGIN(qkrcodecs) Q_IMPORT_PLUGIN(qtaccessiblewidgets) #endif +#ifdef WIN32 +#define strncasecmp _strnicmp +#endif + // Need a global reference for the notifications to find the GUI static BitcoinGUI *guiref; static QSplashScreen *splashref; @@ -177,9 +181,6 @@ void HelpMessageBox::exec() #endif } -#ifdef WIN32 -#define strncasecmp strnicmp -#endif #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) {