From 8d045a18edd6293d9246b991f0553338e36a6543 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 30 Nov 2012 13:47:35 +0100
Subject: php-pecl-xdebug-2.2.2-0.1.gite773b090fc (for PHP 5.5)

---
 xdebug-build.patch | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 xdebug-build.patch

(limited to 'xdebug-build.patch')

diff --git a/xdebug-build.patch b/xdebug-build.patch
new file mode 100644
index 0000000..e9a7d01
--- /dev/null
+++ b/xdebug-build.patch
@@ -0,0 +1,97 @@
+--- xdebug.c.old	2012-11-30 13:22:26.000000000 +0100
++++ xdebug.c	2012-11-30 13:27:34.000000000 +0100
+@@ -65,16 +65,17 @@
+ zend_op_array* (*old_compile_file)(zend_file_handle* file_handle, int type TSRMLS_DC);
+ zend_op_array* xdebug_compile_file(zend_file_handle*, int TSRMLS_DC);
+ 
+-#if PHP_VERSION_ID < 50500
++#if PHP_VERSION_ID < 50600
+ void (*xdebug_old_execute)(zend_op_array *op_array TSRMLS_DC);
+ void xdebug_execute(zend_op_array *op_array TSRMLS_DC);
+-
+-void (*xdebug_old_execute_internal)(zend_execute_data *current_execute_data, int return_value_used TSRMLS_DC);
+-void xdebug_execute_internal(zend_execute_data *current_execute_data, int return_value_used TSRMLS_DC);
+ #else
+ void (*xdebug_old_execute_ex)(zend_execute_data *execute_data TSRMLS_DC);
+ void xdebug_execute_ex(zend_execute_data *execute_data TSRMLS_DC);
+-
++#endif
++#if PHP_VERSION_ID < 50500
++void (*xdebug_old_execute_internal)(zend_execute_data *current_execute_data, int return_value_used TSRMLS_DC);
++void xdebug_execute_internal(zend_execute_data *current_execute_data, int return_value_used TSRMLS_DC);
++#else
+ void (*xdebug_old_execute_internal)(zend_execute_data *current_execute_data, struct _zend_fcall_info *fci, int return_value_used TSRMLS_DC);
+ void xdebug_execute_internal(zend_execute_data *current_execute_data, struct _zend_fcall_info *fci, int return_value_used TSRMLS_DC);
+ #endif
+@@ -569,7 +570,7 @@
+ 	old_compile_file = zend_compile_file;
+ 	zend_compile_file = xdebug_compile_file;
+ 
+-#if PHP_VERSION_ID < 50500
++#if PHP_VERSION_ID < 50600
+ 	xdebug_old_execute = zend_execute;
+ 	zend_execute = xdebug_execute;
+ #else
+@@ -713,7 +714,7 @@
+ 
+ 	/* Reset compile, execute and error callbacks */
+ 	zend_compile_file = old_compile_file;
+-#if PHP_VERSION_ID < 50500
++#if PHP_VERSION_ID < 50600
+ 	zend_execute = xdebug_old_execute;
+ #else
+ 	zend_execute_ex = xdebug_old_execute_ex;
+@@ -1233,7 +1234,7 @@
+ 	return 1;
+ }
+ 
+-#if PHP_VERSION_ID < 50500
++#if PHP_VERSION_ID < 50600
+ void xdebug_execute(zend_op_array *op_array TSRMLS_DC)
+ {
+ 	zend_execute_data    *edata = EG(current_execute_data);
+@@ -1254,7 +1255,7 @@
+ 
+ 	/* If we're evaluating for the debugger's eval capability, just bail out */
+ 	if (op_array && op_array->filename && strcmp("xdebug://debug-eval", op_array->filename) == 0) {
+-#if PHP_VERSION_ID < 50500
++#if PHP_VERSION_ID < 50600
+ 		xdebug_old_execute(op_array TSRMLS_CC);
+ #else
+ 		xdebug_old_execute_ex(execute_data TSRMLS_CC);
+@@ -1265,7 +1266,7 @@
+ 	/* if we're in a ZEND_EXT_STMT, we ignore this function call as it's likely
+ 	   that it's just being called to check for breakpoints with conditions */
+ 	if (edata && edata->opline && edata->opline->opcode == ZEND_EXT_STMT) {
+-#if PHP_VERSION_ID < 50500
++#if PHP_VERSION_ID < 50600
+ 		xdebug_old_execute(op_array TSRMLS_CC);
+ #else
+ 		xdebug_old_execute_ex(execute_data TSRMLS_CC);
+@@ -1379,7 +1380,7 @@
+ 	xdebug_trace_function_begin(fse, function_nr TSRMLS_CC);
+ 
+ 	fse->symbol_table = EG(active_symbol_table);
+-#if PHP_VERSION_ID < 50500
++#if PHP_VERSION_ID < 50600
+ 	fse->execute_data = EG(current_execute_data);
+ #else
+ 	fse->execute_data = EG(current_execute_data)->prev_execute_data;
+@@ -1429,7 +1430,7 @@
+ 		clear = 1;
+ 	}
+ 
+-#if PHP_VERSION_ID < 50500
++#if PHP_VERSION_ID < 50600
+ 	xdebug_old_execute(op_array TSRMLS_CC);
+ #else
+ 	xdebug_old_execute_ex(execute_data TSRMLS_CC);
+@@ -1445,7 +1446,7 @@
+ 	if (XG(collect_return) && do_return && XG(do_trace) && XG(trace_file)) {
+ 		if (EG(return_value_ptr_ptr) && *EG(return_value_ptr_ptr)) {
+ 			char *t;
+-#if PHP_VERSION_ID >= 50500
++#if PHP_VERSION_ID >= 50600
+ 			if (op_array->fn_flags & ZEND_ACC_GENERATOR) {
+ 				t = xdebug_return_trace_stack_generator_retval(fse, (zend_generator *) EG(return_value_ptr_ptr) TSRMLS_CC);
+ 			} else {
-- 
cgit