diff --git a/src/smblib/smbdefs.h b/src/smblib/smbdefs.h index 1ca667909f0ac05ba21f16686ffc1a05ae9dce9d..e5005805e11d75780934930265e032fb504ec6f7 100644 --- a/src/smblib/smbdefs.h +++ b/src/smblib/smbdefs.h @@ -58,15 +58,6 @@ #endif #endif -#define HUGE16 -#define FAR16 -#define REALLOC realloc -#define LMALLOC malloc -#define MALLOC malloc -#define LFREE free -#define FREE free - - #define SDT_BLOCK_LEN 256 /* Size of data blocks */ #define SHD_BLOCK_LEN 256 /* Size of header blocks */ diff --git a/src/xpdev/gen_defs.h b/src/xpdev/gen_defs.h index c863c17093f1f48e6aacac8d8a26cc3734f68542..3bf2ba89ad92028892a472dc2d9831a69731970d 100644 --- a/src/xpdev/gen_defs.h +++ b/src/xpdev/gen_defs.h @@ -492,54 +492,12 @@ typedef struct { #define ZERO_VAR(var) memset(&(var),0,sizeof(var)) #define ZERO_ARRAY(array) memset(array,0,sizeof(array)) -/****************************************************************************/ -/* MALLOC/FREE Macros for various compilers and environments */ -/* MALLOC is used for allocations of 64k or less */ -/* FREE is used to free buffers allocated with MALLOC */ -/* LMALLOC is used for allocations of possibly larger than 64k */ -/* LFREE is used to free buffers allocated with LMALLOC */ -/* REALLOC is used to re-size a previously MALLOCed or LMALLOCed buffer */ -/* FAR16 is used to create a far (32-bit) pointer in 16-bit compilers */ -/* HUGE16 is used to create a huge (32-bit) pointer in 16-bit compilers */ -/****************************************************************************/ -#if defined(__COMPACT__) || defined(__LARGE__) || defined(__HUGE__) - #define HUGE16 huge - #define FAR16 far - #if defined(__TURBOC__) - #define REALLOC(x,y) farrealloc(x,y) - #define LMALLOC(x) farmalloc(x) - #define MALLOC(x) farmalloc(x) - #define LFREE(x) farfree(x) - #define FREE(x) farfree(x) - #elif defined(__WATCOMC__) - #define REALLOC realloc - #define LMALLOC(x) halloc(x,1) /* far heap, but slow */ - #define MALLOC malloc /* far heap, but 64k max */ - #define LFREE hfree - #define FREE free - #else /* Other 16-bit Compiler */ - #define REALLOC realloc - #define LMALLOC malloc - #define MALLOC malloc - #define LFREE free - #define FREE free - #endif -#else /* 32-bit Compiler or Small Memory Model */ - #define HUGE16 - #define FAR16 - #define REALLOC realloc - #define LMALLOC malloc - #define MALLOC malloc - #define LFREE free - #define FREE free -#endif - /********************************/ /* Handy Pointer-freeing Macros */ /********************************/ #define FREE_AND_NULL(x) do { \ if((x)!=NULL) { \ - FREE(x); \ + free(x); \ (x)=NULL; \ } \ } while(0)