make win32 debug output more verbose

Author: Harald Radi

TSRM/TSRM.c

@@ -15,7 +15,6 @@
 #ifdef ZTS
 
 #include <stdio.h>
-#include <stdlib.h>
 
 #if HAVE_STDARG_H
 #include <stdarg.h>

TSRM/TSRM.h

@@ -20,6 +20,7 @@
 
 #ifdef WIN32
 # define TSRM_WIN32
+# include "tsrm_config.w32.h"
 #endif
 
 #ifdef TSRM_WIN32

TSRM/tsrm_config.w32.h

@@ -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

TSRM/tsrm_config_common.h

@@ -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

TSRM/tsrm_win32.c

@@ -18,7 +18,6 @@
 
 /* $Id$ */
 
-#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

TSRM/tsrm_win32.h

@@ -22,8 +22,6 @@
 #define TSRM_WIN32_H
 
 #include "TSRM.h"
-
-#ifdef TSRM_WIN32
 #include <windows.h>
 
 struct ipc_perm {
@@ -73,8 +71,6 @@ typedef struct {
 # define TWG(v) (win32_globals.v)
 #endif
 
-#endif
-
 #define IPC_PRIVATE	0
 #define IPC_CREAT	00001000
 #define IPC_EXCL	00002000

Zend/zend_alloc.c

@@ -17,9 +17,6 @@
    +----------------------------------------------------------------------+
 */
 
-
-#include <stdlib.h>
-
 #include "zend.h"
 #include "zend_alloc.h"
 #include "zend_globals.h"

Zend/zend_config.w32.h

@@ -21,6 +21,13 @@
 #ifndef ZEND_CONFIG_W32_H
 #define ZEND_CONFIG_W32_H
 
+#define HAVE_ALLOCA 1
+#define HAVE_LIMITS_H 1
+#define _CRTDBG_MAP_ALLOC
+
+#include <malloc.h>
+#include <stdlib.h>
+#include <crtdbg.h>
 
 #include <string.h>
 #include <windows.h>
@@ -29,10 +36,6 @@
 typedef unsigned long ulong;
 typedef unsigned int uint;
 
-#define HAVE_ALLOCA 1
-#define HAVE_LIMITS_H 1
-#include <malloc.h>
-
 #undef HAVE_KILL
 #define HAVE_GETPID 1
 /* #define HAVE_ALLOCA_H 1 */

Zend/zend_hash.c

@@ -20,12 +20,6 @@
 
 #include "zend.h"
 
-#include <stdio.h>
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
 #define HANDLE_NUMERIC(key, length, func) {												\
 	register char *tmp=key;																\
 																						\

Zend/zend_ini.c

@@ -16,9 +16,6 @@
    +----------------------------------------------------------------------+
 */
 
-
-#include <stdlib.h>
-
 #include "zend.h"
 #include "zend_qsort.h"
 #include "zend_API.h"

Zend/zend_llist.h

@@ -21,8 +21,6 @@
 #ifndef ZEND_LLIST_H
 #define ZEND_LLIST_H
 
-#include <stdlib.h>
-
 typedef struct _zend_llist_element {
 	struct _zend_llist_element *next;
 	struct _zend_llist_element *prev;

Zend/zend_mm.c

@@ -17,8 +17,6 @@
    +----------------------------------------------------------------------+
 */
 
-#include <stdlib.h>
-#include <string.h>
 #include "zend.h"
 #include "zend_mm.h"
 

Zend/zend_operators.c

@@ -17,13 +17,6 @@
    +----------------------------------------------------------------------+
 */
 
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <math.h>
-
 #include "zend.h"
 #include "zend_operators.h"
 #include "zend_variables.h"

Zend/zend_static_allocator.c

@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include <stdlib.h>
+//#include <stdlib.h>
 
 #include "zend_static_allocator.h"