Browse Source

windows warnings workaround

pull/26/head
R4SAS 7 years ago
parent
commit
f8d6561f60
  1. 1
      src/compat.h
  2. 3
      src/crypter.cpp
  3. 7
      src/key.cpp
  4. 2
      src/noui.cpp
  5. 2
      src/rpcnet.cpp

1
src/compat.h

@ -13,6 +13,7 @@
#endif #endif
#define FD_SETSIZE 1024 // max number of fds in fd_set #define FD_SETSIZE 1024 // max number of fds in fd_set
#include <winsock2.h> #include <winsock2.h>
#include <windows.h>
#include <mswsock.h> #include <mswsock.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#else #else

3
src/crypter.cpp

@ -6,9 +6,12 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <vector> #include <vector>
#include <string> #include <string>
/*
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#endif #endif
*/
#include "crypter.h" #include "crypter.h"

7
src/key.cpp

@ -2,13 +2,12 @@
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "Gost.h"
#include "key.h"
#include <openssl/ecdsa.h> #include <openssl/ecdsa.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/obj_mac.h> #include <openssl/obj_mac.h>
#include "Gost.h"
#include "key.h"
// anonymous namespace with local implementation code (OpenSSL interaction) // anonymous namespace with local implementation code (OpenSSL interaction)
namespace { namespace {

2
src/noui.cpp

@ -32,6 +32,7 @@ static bool noui_ThreadSafeMessageBox(const std::string& message, const std::str
return false; return false;
} }
/* // Never used:
static void noui_ThreadSafeShowGeneratedI2PAddress(const std::string& caption, const std::string& pub, const std::string& priv, const std::string& b32, const std::string& configFileName) static void noui_ThreadSafeShowGeneratedI2PAddress(const std::string& caption, const std::string& pub, const std::string& priv, const std::string& b32, const std::string& configFileName)
{ {
std::string msg = "\nIf you want to use a permanent I2P-address you have to set a \'mydestination\' option in the configuration file:\n"; std::string msg = "\nIf you want to use a permanent I2P-address you have to set a \'mydestination\' option in the configuration file:\n";
@ -50,6 +51,7 @@ static void noui_ThreadSafeShowGeneratedI2PAddress(const std::string& caption, c
printf("%s: %s\n", caption.c_str(), msg.c_str()); printf("%s: %s\n", caption.c_str(), msg.c_str());
fprintf(stderr, "%s: %s\n", caption.c_str(), msg.c_str()); fprintf(stderr, "%s: %s\n", caption.c_str(), msg.c_str());
} }
*/
static bool noui_ThreadSafeAskFee(int64 /*nFeeRequired*/) static bool noui_ThreadSafeAskFee(int64 /*nFeeRequired*/)
{ {

2
src/rpcnet.cpp

@ -2,8 +2,8 @@
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "net.h"
#include "bitcoinrpc.h" #include "bitcoinrpc.h"
#include "net.h"
using namespace json_spirit; using namespace json_spirit;
using namespace std; using namespace std;

Loading…
Cancel
Save