Browse Source

Merge pull request #2618 from fcicq/solaris-support

Partial solaris support
0.10
Jeff Garzik 11 years ago
parent
commit
3d86e7cd48
  1. 5
      src/init.cpp
  2. 2
      src/makefile.unix
  3. 4
      src/net.cpp
  4. 2
      src/netbase.cpp
  5. 12
      src/script.cpp
  6. 8
      src/util.h

5
src/init.cpp

@ -368,6 +368,11 @@ bool AppInit2(boost::thread_group& threadGroup) @@ -368,6 +368,11 @@ bool AppInit2(boost::thread_group& threadGroup)
sigemptyset(&sa_hup.sa_mask);
sa_hup.sa_flags = 0;
sigaction(SIGHUP, &sa_hup, NULL);
#if defined (__SVR4) && defined (__sun)
// ignore SIGPIPE on Solaris
signal(SIGPIPE, SIG_IGN);
#endif
#endif
// ********************************************************* Step 2: parameter interactions

2
src/makefile.unix

@ -13,7 +13,7 @@ USE_IPV6:=1 @@ -13,7 +13,7 @@ USE_IPV6:=1
LINK:=$(CXX)
DEFS=-DBOOST_SPIRIT_THREADSAFE -D_FILE_OFFSET_BITS=64
DEFS=-DBOOST_SPIRIT_THREADSAFE -DBOOST_NO_CXX11_VARIADIC_TEMPLATES -D_FILE_OFFSET_BITS=64
DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))

4
src/net.cpp

@ -15,6 +15,10 @@ @@ -15,6 +15,10 @@
#include <string.h>
#endif
#ifndef WIN32
#include <fcntl.h>
#endif
#ifdef USE_UPNP
#include <miniupnpc/miniwget.h>
#include <miniupnpc/miniupnpc.h>

2
src/netbase.cpp

@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
#include "hash.h"
#ifndef WIN32
#include <sys/fcntl.h>
#include <fcntl.h>
#endif
#include <boost/algorithm/string/case_conv.hpp> // for to_lower()

12
src/script.cpp

@ -2,12 +2,6 @@ @@ -2,12 +2,6 @@
// Copyright (c) 2009-2012 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <boost/foreach.hpp>
#include <boost/tuple/tuple.hpp>
using namespace std;
using namespace boost;
#include "script.h"
#include "core.h"
#include "keystore.h"
@ -16,6 +10,12 @@ using namespace boost; @@ -16,6 +10,12 @@ using namespace boost;
#include "sync.h"
#include "util.h"
#include <boost/foreach.hpp>
#include <boost/tuple/tuple.hpp>
using namespace std;
using namespace boost;
bool CheckSig(vector<unsigned char> vchSig, const vector<unsigned char> &vchPubKey, const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, int flags);

8
src/util.h

@ -101,6 +101,10 @@ T* alignup(T* p) @@ -101,6 +101,10 @@ T* alignup(T* p)
#else
#define MAX_PATH 1024
#endif
// As Solaris does not have the MSG_NOSIGNAL flag for send(2) syscall, it is defined as 0
#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0
#endif
inline void MilliSleep(int64 n)
{
@ -515,6 +519,10 @@ inline void SetThreadPriority(int nPriority) @@ -515,6 +519,10 @@ inline void SetThreadPriority(int nPriority)
}
#else
// PRIO_MAX is not defined on Solaris
#ifndef PRIO_MAX
#define PRIO_MAX 20
#endif
#define THREAD_PRIORITY_LOWEST PRIO_MAX
#define THREAD_PRIORITY_BELOW_NORMAL 2
#define THREAD_PRIORITY_NORMAL 0

Loading…
Cancel
Save