[xdebug-dev] xdebug xdebug/xdebug_compat.c - Make compatible with PHP 5.1.x

Date: Mon Jul 19 21:51:26 CEST 2004
User: Marcus Börger
Directory: xdebug

Log Message:
[20]
- Make compatible with PHP 5.1.x

Modified files:
           xdebug/xdebug_compat.c (version: 1.5)

[FILE: /xdebug/xdebug_compat.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdebug/xdebug_compat.c:1.4 Sun Apr 11 12:44:04 2004 GMT
+++ xdebug/xdebug_compat.c Mon Jul 19 17:51:26 2004 GMT
@@ -16,11 +16,12 @@
    | Modifications: Derick Rethans <derick[@]xdebug.org> |
    +----------------------------------------------------------------------+
  */
-/* $Id: cvstemp,v 1.4 2004/04/11 14:44:04 derick Exp $ */
+/* $Id: cvstemp,v 1.5 2004/07/19 19:51:26 helly Exp $ */
 
 #include "php.h"
 #include "main/php_version.h"
 #include "xdebug_compat.h"
+#include "zend_extensions.h"
 
 #if (PHP_MAJOR_VERSION == 4) && (PHP_MINOR_VERSION == 3) && (PHP_RELEASE_VERSION <= 1)
 
@@ -302,7 +303,11 @@
                                         || ((int)T->str_offset.offset<0)
                                         || (T->str_offset.str->value.str.len <= T->str_offset.offset)) {
                                         zend_error(E_NOTICE, "Uninitialized string offset: %d", T->str_offset.offset);
+#if ZEND_EXTENSION_API_NO >= 220040718
+ T->tmp_var.value.str.val = STR_EMPTY_ALLOC();
+#else
                                         T->tmp_var.value.str.val = empty_string;
+#endif
                                         T->tmp_var.value.str.len = 0;
                                 } else {
                                         char c = str->value.str.val[T->str_offset.offset];
@@ -365,7 +370,11 @@
                                                                 || (T->EA.data.str_offset.offset<0)
                                                                 || (T->EA.data.str_offset.str->value.str.len <= T->EA.data.str_offset.offset)) {
                                                                 zend_error(E_NOTICE, "Uninitialized string offset: %d", T->EA.data.str_offset.offset);
+#if ZEND_EXTENSION_API_NO >= 220040718
+ T->tmp_var.value.str.val = STR_EMPTY_ALLOC();
+#else
                                                                 T->tmp_var.value.str.val = empty_string;
+#endif
                                                                 T->tmp_var.value.str.len = 0;
                                                         } else {
                                                                 char c = str->value.str.val[T->EA.data.str_offset.offset];
Received on Mon Jul 19 2004 - 21:51:32 BST