zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1345 from Diapolo/strnicmp_Win32 

Win32: use _strnicmp (ISO C++) instead of deprecated strnicmp (POSIX)
This commit is contained in:
Jeff Garzik 2012-05-17 15:53:38 -07:00
parent f0fc95a143 f4ac41806a
commit c0a360ce49
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@ -16,6 +16,7 @@
#ifndef WIN32 #ifndef WIN32
#include <signal.h> #include <signal.h>
#define strncasecmp _strnicmp
#endif #endif
using namespace std; using namespace std;
@ -162,7 +163,6 @@ bool static InitError(const std::string &str)
{ {
ThreadSafeMessageBox(str, _("Bitcoin"), wxOK | wxMODAL); ThreadSafeMessageBox(str, _("Bitcoin"), wxOK | wxMODAL);
return false; return false;
} }
bool static InitWarning(const std::string &str) bool static InitWarning(const std::string &str)

7
src/qt/bitcoin.cpp
View File

@ -33,6 +33,10 @@ Q_IMPORT_PLUGIN(qkrcodecs)
Q_IMPORT_PLUGIN(qtaccessiblewidgets) Q_IMPORT_PLUGIN(qtaccessiblewidgets)
#endif #endif
#ifdef WIN32
#define strncasecmp _strnicmp
#endif
// Need a global reference for the notifications to find the GUI // Need a global reference for the notifications to find the GUI
static BitcoinGUI *guiref; static BitcoinGUI *guiref;
static QSplashScreen *splashref; static QSplashScreen *splashref;
@ -177,9 +181,6 @@ void HelpMessageBox::exec()
#endif #endif
} }
#ifdef WIN32
#define strncasecmp strnicmp
#endif
#ifndef BITCOIN_QT_TEST #ifndef BITCOIN_QT_TEST
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {