Browse files

Merge branch 'xdebug_2_1'

  • Loading branch information...
2 parents 5a171b8 + e6d4431 commit 14f157057ebdb317e6b841f282f4c5322c16cbdd @derickr derickr committed Oct 14, 2011
Showing with 0 additions and 7 deletions.
  1. +0 −6 config.m4
  2. +0 −1 config.w32
View
6 config.m4
@@ -20,12 +20,6 @@ dnl Check for new current_execute_data field in zend_executor_globals
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$INCLUDES $CPPFLAGS"
- AC_TRY_COMPILE([
-#include <zend_compile.h>
-#include <zend_globals.h>
- ], [static struct _zend_executor_globals zeg; zend_execute_data *zed = zeg.current_execute_data],
- [AC_DEFINE(HAVE_EXECUTE_DATA_PTR, 1, [ ])]
- )
AC_CHECK_FUNCS(gettimeofday)
PHP_CHECK_LIBRARY(m, cos, [ PHP_ADD_LIBRARY(m,, XDEBUG_SHARED_LIBADD) ])
View
1 config.w32
@@ -6,5 +6,4 @@ ARG_WITH("xdebug", "Xdebug support", "no");
if (PHP_XDEBUG == "yes") {
EXTENSION("xdebug", "xdebug.c xdebug_code_coverage.c xdebug_com.c xdebug_compat.c xdebug_handler_dbgp.c xdebug_handlers.c xdebug_llist.c xdebug_hash.c xdebug_private.c xdebug_profiler.c xdebug_set.c xdebug_stack.c xdebug_str.c xdebug_superglobals.c xdebug_tracing.c xdebug_var.c xdebug_xml.c usefulstuff.c");
AC_DEFINE("HAVE_XDEBUG", 1, "Xdebug support");
- AC_DEFINE("HAVE_EXECUTE_DATA_PTR", 1);
}

0 comments on commit 14f1570

Please sign in to comment.