From f9dd136a09f31cfaffdb7ecad64e199d758ef32b Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Thu, 17 May 2012 20:14:24 -0400 Subject: [PATCH] Revert "use _strnicmp (ISO C++) instead of deprecated strnicmp (POSIX) and add missing "#define strncasecmp _strnicmp" in init.cpp" This reverts commit f4ac41806af5766199a7d526a7becbcb8a0f5ab3. Reason: breaks build. --- src/init.cpp | 2 +- src/qt/bitcoin.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 15eb883ac92..b027a53d81f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -16,7 +16,6 @@ #ifndef WIN32 #include -#define strncasecmp _strnicmp #endif using namespace std; @@ -163,6 +162,7 @@ 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 528c68b1fc6..9452f7e1e32 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -33,10 +33,6 @@ 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; @@ -181,6 +177,9 @@ void HelpMessageBox::exec() #endif } +#ifdef WIN32 +#define strncasecmp strnicmp +#endif #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) {