#define mask31 0x0000001F
/** max function */
-#define max(x,y) ((x)>(y)?(x):(y))
+//#define max(x,y) ((x)>(y)?(x):(y))
/** min function */
-#define min(x,y) ((x)<(y)?(x):(y))
+//#define min(x,y) ((x)<(y)?(x):(y))
/** number of bits in a uint */
-#ifndef W
+#undef W
#define W 32
-#endif
/** W-1 */
-#ifndef Wminusone
+#undef Wminusone
#define Wminusone 31
-#endif
/** 2W*/
-#ifndef WW
+#undef WW
#define WW 64
-#endif
/** number of bits per uchar */
#define bitsM 8