diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-05-22 07:53:42 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-05-22 07:53:42 -0700 |
| commit | eef7c4a77355176541a5fe58a8f605670716e27a (patch) | |
| tree | 748d7ee5044ac15c48f8967064ae52387be9af16 /src | |
| parent | 63407fd6e29b29ee56c572d4c6789c3f305990fc (diff) | |
| parent | 7b671f52e05b6845b934cef2eb0107f30a7677c7 (diff) | |
| download | bitcoin-eef7c4a77355176541a5fe58a8f605670716e27a.tar.xz | |
Merge pull request #1372 from jgarzik/json-threadsafe
Define BOOST_SPIRIT_THREADSAFE at all json_spirit*.h inclusion sites
Diffstat (limited to 'src')
| -rw-r--r-- | src/bitcoinrpc.h | 1 | ||||
| -rw-r--r-- | src/makefile.linux-mingw | 2 | ||||
| -rw-r--r-- | src/makefile.mingw | 2 | ||||
| -rw-r--r-- | src/makefile.osx | 2 | ||||
| -rw-r--r-- | src/makefile.unix | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/src/bitcoinrpc.h b/src/bitcoinrpc.h index 0df6495818..8b2d905179 100644 --- a/src/bitcoinrpc.h +++ b/src/bitcoinrpc.h @@ -9,7 +9,6 @@ #include <string> #include <map> -#define BOOST_SPIRIT_THREADSAFE #include "json/json_spirit_reader_template.h" #include "json/json_spirit_writer_template.h" #include "json/json_spirit_utils.h" diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 61b38a663e..51f49bb3cf 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -27,7 +27,7 @@ LIBS= \ -l ssl \ -l crypto -DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DUSE_IPV6 +DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6 DEBUGFLAGS=-g CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) diff --git a/src/makefile.mingw b/src/makefile.mingw index 47bf8d5304..577c77b7d4 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -23,7 +23,7 @@ LIBS= \ -l ssl \ -l crypto -DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DUSE_IPV6 +DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6 DEBUGFLAGS=-g CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) diff --git a/src/makefile.osx b/src/makefile.osx index 227756f274..9728733122 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -53,7 +53,7 @@ LIBS += \ TESTDEFS += -DBOOST_TEST_DYN_LINK endif -DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DUSE_IPV6 +DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6 ifdef RELEASE # Compile for maximum compatibility and smallest size. diff --git a/src/makefile.unix b/src/makefile.unix index 04e17866e5..9052891b4f 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -4,7 +4,7 @@ USE_UPNP:=0 -DEFS=-DUSE_IPV6 +DEFS=-DUSE_IPV6 -DBOOST_SPIRIT_THREADSAFE 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)) |