X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=CSA.h;h=ec6e890be2bffd93e39452af1bd4d33013ed46e0;hb=a03a69215d4bf9cee1d42ecbc9adcf057b2229dc;hp=b9a17452178c5b4c1eaccdee5b2d202740525768;hpb=dbd62fe27e80414b4cf4fbf512ad1910916e6967;p=SXSI%2FTextCollection.git

diff --git a/CSA.h b/CSA.h
index b9a1745..ec6e890 100644
--- a/CSA.h
+++ b/CSA.h
@@ -21,6 +21,12 @@
 #ifndef _CSA_H_
 #define _CSA_H_
 #include "dynFMI.h"
+#include "BitRank.h"
+#include "TextCollection.h"
+#include "BlockArray.h"
+#include "RLWaveletTree.h"
+#include <set>
+#include <vector>
 
 // Include  from XMLTree/libcds
 #include <basics.h>
@@ -28,12 +34,14 @@
 #include <alphabet_mapper.h>
 #include <static_sequence.h>
 
-#include <set>
-#include <vector>
-#include "BitRank.h"
-#include "TextCollection.h"
-#include "BlockArray.h"
-#include "RLWaveletTree.h"
+// Re-define word size to ulong:
+#undef W
+#if __WORDSIZE == 64
+#   define W 64
+#else
+#   define W 32
+#endif
+
 
 /**
  * Implementation of the TextCollection interface