Merge pull request #1345 from Diapolo/strnicmp_Win32
Win32: use _strnicmp (ISO C++) instead of deprecated strnicmp (POSIX)
This commit is contained in:
commit
c0a360ce49
2 changed files with 5 additions and 4 deletions
|
@ -16,6 +16,7 @@
|
|||
|
||||
#ifndef WIN32
|
||||
#include <signal.h>
|
||||
#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)
|
||||
|
|
|
@ -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[])
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue