make win32 debug output more verbose

diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
index 6af686b0356c91fc1ecf80b9f44ec66e078e1973..f391a8c40b15d3b8a7f0047b54047ec026934994 100644 (file)
--- a/TSRM/TSRM.c
+++ b/TSRM/TSRM.c
@@ -15,7 +15,6 @@
 #ifdef ZTS
 
 #include <stdio.h>
-#include <stdlib.h>
 
 #if HAVE_STDARG_H
 #include <stdarg.h>

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index fb8b4347f9938cda2ee671f7315a9cbbe505d340..d13a4fd1cfe9b378334245e1d6533d934497d7bd 100644 (file)
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -20,6 +20,7 @@
 
 #ifdef WIN32
 # define TSRM_WIN32
+# include "tsrm_config.w32.h"
 #endif
 
 #ifdef TSRM_WIN32

diff --git a/TSRM/tsrm_config.w32.h b/TSRM/tsrm_config.w32.h
index 405d8c7c8f301150399fcf9f0e6e9be08354470c..712b714ae790c57d0698a63bc9e5795c9ad30f86 100644 (file)
--- a/TSRM/tsrm_config.w32.h
+++ b/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

diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h
index 6c220fa008dab3fd1f8868289d9dcbc37d4567aa..7ba86e70adcb06d2886fdc88931eaabb5a42ca2a 100644 (file)
--- a/TSRM/tsrm_config_common.h
+++ b/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

diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index 09999af69e500af561a29b9f8ec093cddbfcc53a..691443a243f16061c4eb0817e580197729f8fe9a 100644 (file)
--- a/TSRM/tsrm_win32.c
+++ b/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

diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h
index 7931beafc49d4ab826c3d145497dafd45721f97e..5e6ec7ece794f1cb0839b14572bbe68f4897954e 100644 (file)
--- a/TSRM/tsrm_win32.h
+++ b/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

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index c93317e75b51337715fde3840cb46d87eae7b0cf..3c6b7f6596b7255d70d1cfe47d8945c360e71571 100644 (file)
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -17,9 +17,6 @@
    +----------------------------------------------------------------------+
 */
 
-
-#include <stdlib.h>
-
 #include "zend.h"
 #include "zend_alloc.h"
 #include "zend_globals.h"

diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h
index e7c393d9e2af55ae6d1430cffaf4241a53d88a00..f13aa0684f9e2219a6bb54fed285f32fa692ad72 100644 (file)
--- a/Zend/zend_config.w32.h
+++ b/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 */

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 77b4caa65685d9c1ef8b417741e330be821e7cda..079069175bc83e120386908f22631e0fd58c467d 100644 (file)
--- a/Zend/zend_hash.c
+++ b/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;                                                                                                                         \
                                                                                                                                                                                \

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index e15ab704c3fc7c330b53084f193938adb0b040d1..42e28379cc170460f507d03e7be9d83e258557cf 100644 (file)
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -16,9 +16,6 @@
    +----------------------------------------------------------------------+
 */
 
-
-#include <stdlib.h>
-
 #include "zend.h"
 #include "zend_qsort.h"
 #include "zend_API.h"

diff --git a/Zend/zend_llist.h b/Zend/zend_llist.h
index 075c9cd83f86832ea351c3ff5ca29b7f4b619190..6fddbb2d92839abd62ccfaf1841f799ad5ecf746 100644 (file)
--- a/Zend/zend_llist.h
+++ b/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;

diff --git a/Zend/zend_mm.c b/Zend/zend_mm.c
index 99bf05d7710c2e1ce4f5b44012d37a6d6b357225..22850aadf2134e3c49934e84cfb2469d54a821db 100644 (file)
--- a/Zend/zend_mm.c
+++ b/Zend/zend_mm.c
@@ -17,8 +17,6 @@
    +----------------------------------------------------------------------+
 */
 
-#include <stdlib.h>
-#include <string.h>
 #include "zend.h"
 #include "zend_mm.h"
 

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 1eae6c036aa1ec410ea09cd381f59f27d7cbe5f7..2e8d79e52262e403a9951dd3e62326d6e71f92d2 100644 (file)
--- a/Zend/zend_operators.c
+++ b/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"

diff --git a/Zend/zend_static_allocator.c b/Zend/zend_static_allocator.c
index afa0cc08bcfa3f7ec0cb3a6f806fc9882ded20c0..e7e7a3689ce3141860017809af2b080b8fd3b8e0 100644 (file)
--- a/Zend/zend_static_allocator.c
+++ b/Zend/zend_static_allocator.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include <stdlib.h>
+//#include <stdlib.h>
 
 #include "zend_static_allocator.h"