diff options
| -rw-r--r-- | src/common/malloc.c | 2 | ||||
| -rw-r--r-- | src/common/malloc.h | 2 |
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);
|