min macro renamed to MIN

Author: inikep

src/Encoder.cpp

@@ -2378,7 +2378,7 @@ void XWRT_Encoder::write_dict(int comprLevel)
 	{
 		cmn=0;
 		if (i>0)
-			cmn=common(sortedDict[i-1].c_str(),sortedDict[i].c_str(),min(sortedDict[i].size(),sortedDict[i-1].size()));
+			cmn=common(sortedDict[i-1].c_str(),sortedDict[i].c_str(),MIN(sortedDict[i].size(),sortedDict[i-1].size()));
 
 		if ((preprocType!=LZ77) && (cmn>0 || (unsigned char)(sortedDict[i][0])>=128))
 			bufferData+=sprintf((char*)bufferData,"%c%s\n",128+cmn,sortedDict[i].c_str()+cmn);
@@ -2810,7 +2810,7 @@ int compare_str_rev( const void *arg1, const void *arg2 )
 	int a=*(int*)arg1;
 	int b=*(int*)arg2;
 
-	int minv=min(dictlen[a],dictlen[b]);
+	int minv=MIN(dictlen[a],dictlen[b]);
 
 	for (int i=1; i<=minv; i++)
 	{
@@ -2870,13 +2870,13 @@ void XWRT_Encoder::sortDict(int size)
 
 	if (preprocType!=LZ77)
 	{
-		qsort(&inttable[0],min(size,dict1size),sizeof(inttable[0]),compare_str);
+		qsort(&inttable[0],MIN(size,dict1size),sizeof(inttable[0]),compare_str);
 
 		if (size>dict1size)
-			qsort(&inttable[dict1size],min(size,bound3)-dict1size,sizeof(inttable[0]),compare_str);
+			qsort(&inttable[dict1size],MIN(size,bound3)-dict1size,sizeof(inttable[0]),compare_str);
 
 		if (size>bound3)
-			qsort(&inttable[bound3],min(size,bound4)-bound3,sizeof(inttable[0]),compare_str);
+			qsort(&inttable[bound3],MIN(size,bound4)-bound3,sizeof(inttable[0]),compare_str);
 
 		if (size>bound4)
 			qsort(&inttable[bound4],size-bound4,sizeof(inttable[0]),compare_str);

src/MemBuffer.cpp

@@ -99,7 +99,7 @@ inline void CMemoryBuffer::ReallocTgtBuf(unsigned int len)
 		OUT_OF_MEMORY();
 
 	NewTargetBuf += 3;
-	memcpy(NewTargetBuf,TargetBuf,min(TgtPtr,len));
+	memcpy(NewTargetBuf,TargetBuf,MIN(TgtPtr,len));
 	TgtLen = len;
 	delete(TargetBuf-3);
 	TargetBuf=NewTargetBuf;

src/XWRT.cpp

@@ -1,6 +1,6 @@
-#include "XWRT.h"
 #include <time.h>
 #include <vector>
+#include "XWRT.h"
 #include "Encoder.h"
 #include "Decoder.h"
 

src/XWRT.h

@@ -110,8 +110,8 @@ class Encoder;
 #define OPTION_UNICODE_BE					524288
 
 
-#if !defined min
-	#define min(a,b) (((a)>(b))?(b):(a))
+#if !defined MIN
+	#define MIN(a,b) (((a)>(b))?(b):(a))
 #endif
 #define IF_OPTION(option) (preprocFlag & option)
 #define OPTION(option) (xml_wrt.preprocFlag & option)

src/lpaq6.h

@@ -12,11 +12,6 @@ typedef unsigned char  U8;
 typedef unsigned short U16;
 typedef unsigned int   U32;
 
-// min, max functions
-#ifndef min
-inline int min(int a, int b) {return a<b?a:b;}
-inline int max(int a, int b) {return a<b?b:a;}
-#endif
 
 template <int B>
 class HashTable {