fix build

SalvatorePreviti · Aug 11, 2021 · ce3148d · ce3148d
1 parent 4f339c5
commit ce3148d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -6,8 +6,7 @@
             "cflags_cc": ["-O3", "-std=c++14"],
             "sources": [
                 "src/cpp/v8utils/v8utils.cpp",
-                "src/cpp/RoaringBitmap32.cpp",
-                "src/cpp/roaring.cpp",
+                "src/cpp/RoaringBitmap32.cpp"
             ],
             "conditions": [
                 [

diff --git a/src/cpp/RoaringBitmap32.cpp b/src/cpp/RoaringBitmap32.cpp
@@ -1,5 +1,7 @@
 #include <stdio.h>
 
+#include "roaring.h"
+
 #include "RoaringBitmap32.h"
 
 #define MAX_SERIALIZATION_ARRAY_SIZE_IN_BYTES 0x00FFFFFF
@@ -1886,3 +1888,22 @@ void RoaringBitmap32BufferedIterator::WeakCallback(v8::WeakCallbackInfo<RoaringB
   RoaringBitmap32BufferedIterator * p = info.GetParameter();
   delete p;
 }
+
+/////////////////// ROARING LIBRARY ///////////////////
+
+#define printf(...) ((void)0)
+#define fprintf(...) ((void)0)
+
+#if defined(__clang__)
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wunused-variable"
+#endif
+
+#include "CRoaringUnityBuild/roaring.c"
+
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#endif
+
+#undef printf
+#undef fprintf
diff --git a/src/cpp/roaring.cpp b/src/cpp/roaring.cpp
diff --git a/src/cpp/roaring.h b/src/cpp/roaring.h
@@ -1,5 +1,5 @@
-#ifndef __ROARING__H__
-#define __ROARING__H__
+#ifndef __SP_ROARING__H__
+#define __SP_ROARING__H__
 
 #include <assert.h>
 #include <stddef.h>