From cb2452c0149e4a4d1f9fa08bf1aafd146f3ca2de Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 7 Apr 2007 21:15:34 +0000
Subject: - Fixed the platform-specific stricmp compilation problem - Fixed
 inverted vending tax equation (venders getting only 2% zeny instead of 98%),
 and made it more precise

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10182 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/common/cbasetypes.h |  6 ++++++
 src/common/mmo.h        | 19 -------------------
 2 files changed, 6 insertions(+), 19 deletions(-)

(limited to 'src/common')

diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index b513b7fa3..6db351b67 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -198,8 +198,14 @@ typedef unsigned long long	uint64;
 #if defined(_MSC_VER) || defined(__BORLANDC__)
 #define strcasecmp			stricmp
 #define strncasecmp			strnicmp
+#define strncmpi			strnicmp
 #define snprintf			_snprintf
 #define vsnprintf			_vsnprintf
+#else
+#define strcmpi				strcasecmp
+#define stricmp				strcasecmp
+#define strncmpi			strncasecmp
+#define strnicmp			strncasecmp
 #endif
 
 // keyword replacement in windows
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 75b741697..bd5a067d9 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -489,23 +489,4 @@ enum {
 	JOB_SOUL_LINKER,
 };
 
-#ifndef __WIN32
-	#ifndef strcmpi
-		#define strcmpi strcasecmp
-	#endif
-	#ifndef stricmp
-		#define stricmp strcasecmp
-	#endif
-	#ifndef strncmpi
-		#define strncmpi strncasecmp
-	#endif
-	#ifndef strnicmp
-		#define strnicmp strncasecmp
-	#endif
-#else
-	#ifndef strncmpi
-		#define strncmpi strnicmp
-	#endif
-#endif
-
 #endif /* _MMO_H_ */
-- 
cgit v1.2.3-70-g09d2