summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-07 21:15:34 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-07 21:15:34 +0000
commitcb2452c0149e4a4d1f9fa08bf1aafd146f3ca2de (patch)
tree3fa1de03a0c77861780d048a8e96351d0121352e /src/common
parent2326caf8d02d81d7f4bb96817cbad8e1c639169d (diff)
downloadhercules-cb2452c0149e4a4d1f9fa08bf1aafd146f3ca2de.tar.gz
hercules-cb2452c0149e4a4d1f9fa08bf1aafd146f3ca2de.tar.bz2
hercules-cb2452c0149e4a4d1f9fa08bf1aafd146f3ca2de.tar.xz
hercules-cb2452c0149e4a4d1f9fa08bf1aafd146f3ca2de.zip
- 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
Diffstat (limited to 'src/common')
-rw-r--r--src/common/cbasetypes.h6
-rw-r--r--src/common/mmo.h19
2 files changed, 6 insertions, 19 deletions
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_ */