summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-27 22:28:35 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-27 22:28:35 +0000
commit847d13b2f140d903db4ec3f74e01c8c9776dd685 (patch)
tree00ddd222870230343dbcd3648ec6d7bd80454fd4 /src
parent1423b37feb3a548ad917bf7667a2e1b5b85562de (diff)
downloadhercules-847d13b2f140d903db4ec3f74e01c8c9776dd685.tar.gz
hercules-847d13b2f140d903db4ec3f74e01c8c9776dd685.tar.bz2
hercules-847d13b2f140d903db4ec3f74e01c8c9776dd685.tar.xz
hercules-847d13b2f140d903db4ec3f74e01c8c9776dd685.zip
And a minor typo. Sorry.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8506 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/common/malloc.c2
-rw-r--r--src/common/malloc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/malloc.c b/src/common/malloc.c
index 303bf9cac..db76974b5 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -686,7 +686,7 @@ static void memmgr_init (void)
}
#endif
-#if defined(MEMSET_TURBO) || defined(_WIN32)
+#if defined(MEMSET_TURBO) && defined(_WIN32)
void malloc_set(void *dest, int value, int count){
_asm
{
diff --git a/src/common/malloc.h b/src/common/malloc.h
index 322ee9e79..d75ff548c 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -156,7 +156,7 @@ unsigned int malloc_usage (void);
#define INLINE inline
#endif
#endif
-#if defined(MEMSET_TURBO) || defined(_WIN32)
+#if defined(MEMSET_TURBO) && defined(_WIN32)
INLINE void malloc_set(void *, int, int);
INLINE void malloc_tsetdword(void *, int, int);
INLINE void malloc_tsetword(void *, short, int);