From 29f279debfdd9e4b9df2c8c0ba41b198b99a3ea7 Mon Sep 17 00:00:00 2001
From: Janne Ramstedt <janne@Acart.(none)>
Date: Mon, 5 Aug 2013 22:49:12 +0300
Subject: [PATCH] Changes to get build working for Solaris 11.1

---
 README.md                 |  2 +-
 src/compat.h              | 16 ++++++++++++++++
 src/net.cpp               |  1 +
 src/netbase.cpp           |  4 ----
 src/script.cpp            |  6 +++---
 src/test/mruset_tests.cpp |  4 ++--
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 30ea4d6f..51b02b1f 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,7 @@ submit new unit tests for old code.
 
 Unit tests for the core code are in `src/test/`. To compile and run them:
 
-    cd src; make -f makefile.unix test
+    cd src; make -f makefile.solaris test
 
 Unit tests for the GUI code are in `src/qt/test/`. To compile and run them:
 
diff --git a/src/compat.h b/src/compat.h
index 115008de..0b934204 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -18,7 +18,11 @@
 #else
 #include <sys/types.h>
 #include <sys/socket.h>
+#ifndef __sun__
 #include <sys/fcntl.h>
+#else
+#include <fcntl.h>
+#endif
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <net/if.h>
@@ -26,6 +30,18 @@
 #include <ifaddrs.h>
 #endif
 
+#ifdef __sun__
+using std::map;
+#endif
+
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
+#ifndef PRIO_MAX
+#define PRIO_MAX 20
+#endif
+
 #ifndef _WIN64
 typedef u_int SOCKET;
 #endif
diff --git a/src/net.cpp b/src/net.cpp
index 6fbcf1b5..7e8a879c 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -25,6 +25,7 @@
 // Dump addresses to peers.dat every 15 minutes (900s)
 #define DUMP_ADDRESSES_INTERVAL 900
 
+using std::map;
 using namespace std;
 using namespace boost;
 
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 08d13374..57b356eb 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -8,10 +8,6 @@
 #include "sync.h"
 #include "hash.h"
 
-#ifndef WIN32
-#include <sys/fcntl.h>
-#endif
-
 #include <boost/algorithm/string/case_conv.hpp> // for to_lower()
 #include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()
 
diff --git a/src/script.cpp b/src/script.cpp
index 90066efd..cf6331fd 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -5,9 +5,6 @@
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 
-using namespace std;
-using namespace boost;
-
 #include "script.h"
 #include "keystore.h"
 #include "bignum.h"
@@ -16,6 +13,9 @@ using namespace boost;
 #include "sync.h"
 #include "util.h"
 
+using namespace std;
+using namespace boost;
+
 bool CheckSig(vector<unsigned char> vchSig, vector<unsigned char> vchPubKey, CScript scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, int flags);
 
 
diff --git a/src/test/mruset_tests.cpp b/src/test/mruset_tests.cpp
index 64a6678a..17329f30 100644
--- a/src/test/mruset_tests.cpp
+++ b/src/test/mruset_tests.cpp
@@ -1,10 +1,10 @@
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
 #include "mruset.h"
 #include "util.h"
 
+using namespace std;
+
 #define NUM_TESTS 16
 #define MAX_SIZE 100