summaryrefslogtreecommitdiff
path: root/src/common/malloc.h
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-27 22:20:00 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-27 22:20:00 +0000
commit1423b37feb3a548ad917bf7667a2e1b5b85562de (patch)
tree190228d3fdf57d3df5f166b5849ba4ec02cf5272 /src/common/malloc.h
parenta7b905c5e5a01572e29f1de8fde1e09a27f6d439 (diff)
downloadhercules-1423b37feb3a548ad917bf7667a2e1b5b85562de.tar.gz
hercules-1423b37feb3a548ad917bf7667a2e1b5b85562de.tar.bz2
hercules-1423b37feb3a548ad917bf7667a2e1b5b85562de.tar.xz
hercules-1423b37feb3a548ad917bf7667a2e1b5b85562de.zip
Tweaked MEMSET_TURBO abit, temperory disabled GCC version.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8505 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/malloc.h')
-rw-r--r--src/common/malloc.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/malloc.h b/src/common/malloc.h
index d3df667a6..322ee9e79 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -4,7 +4,7 @@
#ifndef _MALLOC_H_
#define _MALLOC_H_
-//#define MEMSET_TURBO
+#define MEMSET_TURBO
#ifndef __NETBSD__
#if __STDC_VERSION__ < 199901L
@@ -156,14 +156,14 @@ unsigned int malloc_usage (void);
#define INLINE inline
#endif
#endif
-#ifdef MEMSET_TURBO
- INLINE void malloc_tsetdword(void *dest, int value, int count);
- INLINE void malloc_tsetword(void *dest, short value, int count);
- INLINE void malloc_set(void *dest, int value, int size);
+#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);
#else
+ #define malloc_set(x,y,z) memset(x,y,z)
#define malloc_tsetdword(x,y,z) memset(x,y,z)
#define malloc_tsetword(x,y,z) memset(x,y,z)
- #define malloc_set(x,y,z) memset(x,y,z)
#endif
void malloc_init (void);
void malloc_final (void);