diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2018-04-06 13:33:08 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-04-06 13:33:08 +0400 |
| commit | 400a8eb60f832030a04a248e2c96552aa3f44055 (patch) | |
| tree | fb6795349fa3a1d09a792eb6352a4c63e07311e4 | |
| parent | 890115578007af9da9907c87d53f639166d564e7 (diff) | |
| download | mariadb-git-400a8eb60f832030a04a248e2c96552aa3f44055.tar.gz | |
MDEV-15291 - OQGraph fails to build on FreeBSD
Boost includes sys/param.h on FreeBSD, which in turn defines setbit()
macro. This macro is conflicting with open_query::judy_bitset::setbit().
Reordered includes such that oqgraph_judy.h never sees this macro.
Also removed duplicate includes of graphcore-config.h, which is included
by graphcore-graph.h/oqgraph_shim.h/oqgraph_thunk.h.
| -rw-r--r-- | storage/oqgraph/graphcore-graph.cc | 1 | ||||
| -rw-r--r-- | storage/oqgraph/graphcore.cc | 1 | ||||
| -rw-r--r-- | storage/oqgraph/oqgraph_shim.h | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/storage/oqgraph/graphcore-graph.cc b/storage/oqgraph/graphcore-graph.cc index 31d62c5f4c2..cf6c7ccccdc 100644 --- a/storage/oqgraph/graphcore-graph.cc +++ b/storage/oqgraph/graphcore-graph.cc @@ -22,6 +22,5 @@ ====================================================================== */ -#include "graphcore-config.h" #include "graphcore-graph.h" diff --git a/storage/oqgraph/graphcore.cc b/storage/oqgraph/graphcore.cc index 4a6d631be04..7006e51e220 100644 --- a/storage/oqgraph/graphcore.cc +++ b/storage/oqgraph/graphcore.cc @@ -25,7 +25,6 @@ #include <string.h> #include <cstdlib> -#include "graphcore-config.h" #include "graphcore-graph.h" #include <set> diff --git a/storage/oqgraph/oqgraph_shim.h b/storage/oqgraph/oqgraph_shim.h index c3e5ee6a832..d3e7d044e86 100644 --- a/storage/oqgraph/oqgraph_shim.h +++ b/storage/oqgraph/oqgraph_shim.h @@ -24,8 +24,8 @@ #pragma once -#include "oqgraph_thunk.h" #include "oqgraph_judy.h" +#include "oqgraph_thunk.h" #define BOOST_NO_HASH 1 #define BOOST_NO_SLIST 1 |