Browse Source

And a minor typo. Sorry.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8506 54d463be-8e91-2dee-dedb-b68131a5f0ec
Lance 18 years ago
parent
commit
52453a6433
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/common/malloc.c
  2. 1 1
      src/common/malloc.h

+ 1 - 1
src/common/malloc.c

@@ -686,7 +686,7 @@ static void memmgr_init (void)
 }
 }
 #endif
 #endif
 
 
-#if defined(MEMSET_TURBO) || defined(_WIN32)
+#if defined(MEMSET_TURBO) && defined(_WIN32)
 	void malloc_set(void *dest, int value, int count){
 	void malloc_set(void *dest, int value, int count){
 		_asm
 		_asm
 			{
 			{

+ 1 - 1
src/common/malloc.h

@@ -156,7 +156,7 @@ unsigned int malloc_usage (void);
 		#define INLINE inline
 		#define INLINE inline
 	#endif
 	#endif
 #endif
 #endif
-#if defined(MEMSET_TURBO) || defined(_WIN32)
+#if defined(MEMSET_TURBO) && defined(_WIN32)
 	INLINE void malloc_set(void *, int, int);
 	INLINE void malloc_set(void *, int, int);
 	INLINE void malloc_tsetdword(void *, int, int);
 	INLINE void malloc_tsetdword(void *, int, int);
 	INLINE void malloc_tsetword(void *, short, int);
 	INLINE void malloc_tsetword(void *, short, int);