Skip to content
Permalink
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
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
@@ -22,6 +22,5 @@
======================================================================
*/

#include "graphcore-config.h"
#include "graphcore-graph.h"

@@ -25,7 +25,6 @@
#include <string.h>
#include <cstdlib>

#include "graphcore-config.h"
#include "graphcore-graph.h"

#include <set>
@@ -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

0 comments on commit 400a8eb

Please sign in to comment.