X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=utilities%2FCxImage%2Fximadef.h;h=e4bf05e9a720d2bf1a1f4a818e8f24b03f977e94;hb=f05cc2cf37d7ec960b73fa9d2393d5a888e1f87a;hp=b388b2b81f4c8cad255c990374545c446305aea4;hpb=441099a730f593b2226f400afef8c756b05efc69;p=clitk.git

diff --git a/utilities/CxImage/ximadef.h b/utilities/CxImage/ximadef.h
index b388b2b..e4bf05e 100644
--- a/utilities/CxImage/ximadef.h
+++ b/utilities/CxImage/ximadef.h
@@ -53,11 +53,11 @@
  #define CXIMAGE_SUPPORT_WINDOWS 0
 #endif
 
-#ifndef min
-#define min(a,b) (((a)<(b))?(a):(b))
+#ifndef __min
+#define __min(a,b) (((a)<(b))?(a):(b))
 #endif
-#ifndef max
-#define max(a,b) (((a)>(b))?(a):(b))
+#ifndef __max
+#define __max(a,b) (((a)>(b))?(a):(b))
 #endif
 
 #ifndef PI