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

diff --git a/CSA.h b/CSA.h
index e5852b9..ec6e890 100644
--- a/CSA.h
+++ b/CSA.h
@@ -20,25 +20,28 @@
 
 #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>
 #include <static_bitsequence.h>
 #include <alphabet_mapper.h>
 #include <static_sequence.h>
 
-//clash between TextCollection/Tools.h and libcds/includes/basics.h
-// Number of bits in ulong vs uint.
+// Re-define word size to ulong:
 #undef W
-#undef WW
-#undef Wminusone
+#if __WORDSIZE == 64
+#   define W 64
+#else
+#   define W 32
+#endif
 
-#include "dynFMI.h"
-#include "BitRank.h"
-#include "TextCollection.h"
-#include "BlockArray.h"
-#include "RLWaveletTree.h"
-#include <set>
-#include <vector>
 
 /**
  * Implementation of the TextCollection interface