TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compile out memory checker if not enabled - patch by Kp

Browse source
This commit is contained in:
zicodxx 2012-09-02 19:16:21 +02:00
parent c4307f392a
commit 48a496140a
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D2X-Rebirth Changelog
20120902
--------
include/u_mem.h: Compile out memory checker if not enabled - patch by Kp
20120901
--------
main/vers_id.h: Fixed incorrect patch merge introduced in the last commit

7
include/u_mem.h
View file

@ -18,10 +18,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#define MEM_K 1.5 // Dynamic array growth factor
void mem_init(void);
#if !defined(NDEBUG)
void mem_init(void);
void mem_display_blocks();
extern void * mem_malloc( unsigned int size, char * var, char * file, int line, int fill_zero );
extern void * mem_realloc( void * buffer, unsigned int size, char * var, char * file, int line );
@ -41,6 +40,10 @@ void mem_validate_heap();
#else
static inline void mem_init(void)
{
}
#ifdef macintosh
extern char *strdup(const char *str);
#endif