Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
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.
- Loading branch information
Sergey Vojtovich
committed
Apr 6, 2018
1 parent
8901155
commit 400a8eb
Showing
3 changed files
with
1 addition
and
3 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -25,7 +25,6 @@ | ||
| #include <string.h> | ||
| #include <cstdlib> | ||
|
|
||
| #include "graphcore-config.h" | ||
| #include "graphcore-graph.h" | ||
|
|
||
| #include <set> | ||
This file contains 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