make test to work with php5.2

[packages/php.git] / php-sybase-fix.patch

diff --git a/php-sybase-fix.patch b/php-sybase-fix.patch
index 519c1006d309603a216b70d366de3ae62047c0d8..7125297a31dfb5997f85ee954418d179b1b95d20 100644 (file)
--- a/php-sybase-fix.patch
+++ b/php-sybase-fix.patch
@@ -1,6 +1,6 @@
-diff -ur php-5.0.2.orig/ext/sybase/config.m4 php-5.0.2/ext/sybase/config.m4
---- php-5.0.2.orig/ext/sybase/config.m4        2004-11-16 23:02:23.000000000 +0100
-+++ php-5.0.2/ext/sybase/config.m4     2004-11-16 23:01:42.000000000 +0100
+diff -burN php-5.0.4RC1.orig/ext/sybase/config.m4 php-5.0.4RC1/ext/sybase/config.m4
+--- php-5.0.4RC1.orig/ext/sybase/config.m4     2005-03-15 18:02:27.502313968 +0100
++++ php-5.0.4RC1/ext/sybase/config.m4  2005-03-15 18:09:18.738796520 +0100
 @@ -18,6 +18,7 @@
    PHP_ADD_INCLUDE($SYBASE_INCDIR)
    PHP_ADD_LIBRARY_WITH_PATH(sybdb, $SYBASE_LIBDIR, SYBASE_SHARED_LIBADD)
@@ -9,21 +9,3 @@ diff -ur php-5.0.2.orig/ext/sybase/config.m4 php-5.0.2/ext/sybase/config.m4
    AC_CHECK_LIB(dnet_stub, dnet_addr,
       [ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,SYBASE_SHARED_LIBADD)
          AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])
-diff -ur php-5.0.2.orig/ext/sybase/php_sybase_db.c php-5.0.2/ext/sybase/php_sybase_db.c
---- php-5.0.2.orig/ext/sybase/php_sybase_db.c  2004-07-10 09:46:08.000000000 +0200
-+++ php-5.0.2/ext/sybase/php_sybase_db.c       2004-11-16 23:04:25.000000000 +0100
-@@ -1108,9 +1108,11 @@
- {
-       php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-       if (Z_TYPE_P(return_value)==IS_ARRAY) {
--              Z_TYPE_P(return_value)=IS_OBJECT;
--              Z_OBJPROP_P(return_value) = Z_ARRVAL_P(return_value);
--              Z_OBJCE_P(return_value) = ZEND_STANDARD_CLASS_DEF_PTR;
-+              object_and_properties_init(
-+                  return_value, 
-+                  ZEND_STANDARD_CLASS_DEF_PTR, 
-+                  Z_ARRVAL_P(return_value)
-+                  );
-       }
- }
- /* }}} */