Created
August 10, 2012 10:07
-
-
Save farhaven/3313155 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/db.cpp b/src/db.cpp | |
index e494d28..8347208 100644 | |
--- a/src/db.cpp | |
+++ b/src/db.cpp | |
@@ -88,7 +88,7 @@ bool CDBEnv::Open(boost::filesystem::path pathEnv_) | |
dbenv.set_errfile(fopen(pathErrorFile.string().c_str(), "a")); /// debug | |
dbenv.set_flags(DB_AUTO_COMMIT, 1); | |
dbenv.set_flags(DB_TXN_WRITE_NOSYNC, 1); | |
- dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1); | |
+ // dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1); | |
int ret = dbenv.open(pathDataDir.string().c_str(), | |
DB_CREATE | | |
DB_INIT_LOCK | | |
diff --git a/src/makefile.unix b/src/makefile.unix | |
index 2784335..cdb1e17 100644 | |
--- a/src/makefile.unix | |
+++ b/src/makefile.unix | |
@@ -6,6 +6,11 @@ USE_UPNP:=0 | |
DEFS=-DUSE_IPV6 -DBOOST_SPIRIT_THREADSAFE | |
+BOOST_INCLUDE_PATH=/usr/local/include | |
+BDB_INCLUDE_PATH=/usr/local/include/db4 | |
+BOOST_LIB_PATH=/usr/local/lib | |
+BOOST_LIB_SUFFIX=-mt | |
+ | |
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)) | |
@@ -44,7 +49,6 @@ endif | |
LIBS+= \ | |
-Wl,-B$(LMODE2) \ | |
-l z \ | |
- -l dl \ | |
-l pthread | |
diff --git a/src/netbase.cpp b/src/netbase.cpp | |
index 0a54fdf..02f89b2 100644 | |
--- a/src/netbase.cpp | |
+++ b/src/netbase.cpp | |
@@ -71,7 +71,7 @@ bool static LookupIntern(const char *pszName, std::vector<CNetAddr>& vIP, unsign | |
aiHint.ai_socktype = SOCK_STREAM; | |
aiHint.ai_protocol = IPPROTO_TCP; | |
-#ifdef WIN32 | |
+#if defined(WIN32) || defined(__OpenBSD__) | |
# ifdef USE_IPV6 | |
aiHint.ai_family = AF_UNSPEC; | |
# else |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment