cvs: TSRM / TSRM.c TSRM.h tsrm_config.w32.h tsrm_config_common.h tsrm_win32.c tsrm_win32.h

phanto Wed Aug 7 10:47:05 2002 EDT Modified files: /TSRM TSRM.c TSRM.h tsrm_config.w32.h tsrm_config_common.h tsrm_win32.c tsrm_win32.h Log: make win32 debug output more verbose Index: TSRM/TSRM.c diff -u TSRM/TSRM.c:1.43 TSRM/TSRM.c:1.44 --- TSRM/TSRM.c:1.43 Tue May 28 04:54:17 2002 +++ TSRM/TSRM.c Wed Aug 7 10:47:05 2002 @@ -15,7 +15,6 @@ #ifdef ZTS #include <stdio.h> -#include <stdlib.h> #if HAVE_STDARG_H #include <stdarg.h> Index: TSRM/TSRM.h diff -u TSRM/TSRM.h:1.34 TSRM/TSRM.h:1.35 --- TSRM/TSRM.h:1.34 Wed May 29 01:16:58 2002 +++ TSRM/TSRM.h Wed Aug 7 10:47:05 2002 @@ -20,6 +20,7 @@ #ifdef WIN32 # define TSRM_WIN32 +# include "tsrm_config.w32.h" #endif #ifdef TSRM_WIN32 Index: TSRM/tsrm_config.w32.h diff -u TSRM/tsrm_config.w32.h:1.2 TSRM/tsrm_config.w32.h:1.3 --- TSRM/tsrm_config.w32.h:1.2 Wed Sep 6 16:27:12 2000 +++ TSRM/tsrm_config.w32.h Wed Aug 7 10:47:05 2002 @@ -3,6 +3,11 @@ #define HAVE_UTIME 1 #define HAVE_ALLOCA 1 +#define _CRTDBG_MAP_ALLOC + +#include <malloc.h> +#include <stdlib.h> +#include <crtdbg.h> #undef inline #ifdef ZEND_WIN32_FORCE_INLINE Index: TSRM/tsrm_config_common.h diff -u TSRM/tsrm_config_common.h:1.7 TSRM/tsrm_config_common.h:1.8 --- TSRM/tsrm_config_common.h:1.7 Wed May 29 04:41:21 2002 +++ TSRM/tsrm_config_common.h Wed Aug 7 10:47:05 2002 @@ -14,10 +14,6 @@ # include <sys/param.h> #endif -#ifdef TSRM_WIN32 -#include <malloc.h> -#endif - /* AIX requires this to be the first thing in the file. */ #ifndef __GNUC__ # if HAVE_ALLOCA_H Index: TSRM/tsrm_win32.c diff -u TSRM/tsrm_win32.c:1.12 TSRM/tsrm_win32.c:1.13 --- TSRM/tsrm_win32.c:1.12 Tue Dec 11 10:16:20 2001 +++ TSRM/tsrm_win32.c Wed Aug 7 10:47:05 2002 @@ -16,9 +16,8 @@ +----------------------------------------------------------------------+ */ -/* $Id: tsrm_win32.c,v 1.12 2001/12/11 15:16:20 sebastian Exp $ */ +/* $Id: tsrm_win32.c,v 1.13 2002/08/07 14:47:05 phanto Exp $ */ -#include <stdlib.h> #include <stdio.h> #include <fcntl.h> #include <io.h> @@ -28,7 +27,6 @@ #include "TSRM.h" #ifdef TSRM_WIN32 -#include <windows.h> #include "tsrm_win32.h" #ifdef ZTS Index: TSRM/tsrm_win32.h diff -u TSRM/tsrm_win32.h:1.7 TSRM/tsrm_win32.h:1.8 --- TSRM/tsrm_win32.h:1.7 Tue Dec 11 10:16:20 2001 +++ TSRM/tsrm_win32.h Wed Aug 7 10:47:05 2002 @@ -16,14 +16,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: tsrm_win32.h,v 1.7 2001/12/11 15:16:20 sebastian Exp $ */ +/* $Id: tsrm_win32.h,v 1.8 2002/08/07 14:47:05 phanto Exp $ */ #ifndef TSRM_WIN32_H #define TSRM_WIN32_H #include "TSRM.h" - -#ifdef TSRM_WIN32 #include <windows.h> struct ipc_perm { @@ -71,8 +69,6 @@ # define TWG(v) TSRMG(win32_globals_id, tsrm_win32_globals *, v) #else # define TWG(v) (win32_globals.v) -#endif - #endif #define IPC_PRIVATE 0