#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