From a135a7b1254f2051a6fe4dd75c286f61ce3d222b Mon Sep 17 00:00:00 2001
From: x <powturbo@gmail.com>
Date: Sat, 13 Jan 2018 16:02:23 +0100
Subject: [PATCH] TurboPFor: Elias fano encode/decode

---
 eliasfano.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/eliasfano.c b/eliasfano.c
index 2155c0d..e4947fa 100644
--- a/eliasfano.c
+++ b/eliasfano.c
@@ -95,8 +95,7 @@
 #undef EFANODEC
 
 //----------------------
-  #ifndef NSIMD 
-    #ifdef __SSE2__
+  #if defined(__SSE2__) && defined(USE_SSE)
 #define VSIZE 128
 
 #define BITPACK   bitpack128v
@@ -113,9 +112,9 @@
 #define EFANODEC  efanodec128v
 
 #include "eliasfano.c"
-    #endif
+  #endif
 	
-#if defined(__AVX2__) && defined(AVX2_ON)
+  #if defined(__AVX2__) && defined(USE_AVX2)
 #define VSIZE 256
 #define BITPACK bitpack256v
 #define BITUNPACK bitunpack256v
@@ -128,7 +127,6 @@
 #define EFANOENC efanoenc256v
 #define EFANODEC efanodec256v
 #include "eliasfano.c"
-    #endif
   #endif
 
 #else //--------------------------------------------- implementation ---------------------------------------------------------------