From ce3148d43f858cf7194aa66f316bf7faba5638ec Mon Sep 17 00:00:00 2001
From: Salvatore Previti <salvatorepreviti@improbable.io>
Date: Wed, 11 Aug 2021 02:31:47 +0100
Subject: [PATCH] fix build

---
 binding.gyp                 |  3 +--
 src/cpp/RoaringBitmap32.cpp | 21 +++++++++++++++++++++
 src/cpp/roaring.cpp         | 19 -------------------
 src/cpp/roaring.h           |  4 ++--
 4 files changed, 24 insertions(+), 23 deletions(-)
 delete mode 100644 src/cpp/roaring.cpp

diff --git a/binding.gyp b/binding.gyp
index ccdb3f0..7fc6c44 100644
--- 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
index 41512a8..b1aaf85 100644
--- 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
\ No newline at end of file
diff --git a/src/cpp/roaring.cpp b/src/cpp/roaring.cpp
deleted file mode 100644
index 74400d1..0000000
--- a/src/cpp/roaring.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/////////////////// ROARING LIBRARY ///////////////////
-#include "roaring.h"
-
-#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
\ No newline at end of file
diff --git a/src/cpp/roaring.h b/src/cpp/roaring.h
index a4c2633..0c9048d 100644
--- 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>