X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=libcds%2Fsrc%2Fbasics.h;h=4e00cae3ab5bbb8698d97d91eb466c9c2a8beea5;hb=1413ae2197d87e87571c9d8d6fc9f20f691fcea3;hp=6412228d63d670b4a027039873bc22e99e65fc8f;hpb=e76100fc86bf4681cc6de5b0d80f3e00ade660a5;p=SXSI%2FXMLTree.git

diff --git a/libcds/src/basics.h b/libcds/src/basics.h
index 6412228..4e00cae 100644
--- a/libcds/src/basics.h
+++ b/libcds/src/basics.h
@@ -41,18 +41,21 @@ using namespace std;
 #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 */
+#undef W
 #define W 32
 
 /** W-1 */
+#undef Wminusone
 #define Wminusone 31
 
 /** 2W*/
+#undef WW
 #define WW 64
 
 /** number of bits per uchar */