Changeset 593 for branches/1.3/xc_malloc.c

Timestamp:

07/05/2009 06:06:15 AM (4 years ago)

Author:

moo

Message:

merged r304,r305,r306,r307 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• xc_malloc.c (modified) (2 diffs)

branches/1.3/xc_malloc.c

@@ -11 +11 @@
 #include "php.h"
 #include "align.h"
+#include "utils.h"
 
 struct _xc_malloc_mem_t {
@@ -116 +117 @@
     xc_shmsize_t       memoffset;
 };
-
-#undef NDEBUG
-#ifdef ALLOC_DEBUG
-#   define inline
-#else
-#   define NDEBUG
-#endif
-#include <assert.h>
 /* }}} */