- make it possible to coinstall phpXY-pdo-pgsql

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

diff --git a/php-sybase-fix.patch b/php-sybase-fix.patch
index e866f9ece88c748c92d510399a83898477155d6d..7125297a31dfb5997f85ee954418d179b1b95d20 100644 (file)
--- a/php-sybase-fix.patch
+++ b/php-sybase-fix.patch
@@ -1,5 +1,6 @@
---- php-4.3.3RC3/ext/sybase/config.m4.orig     2002-03-12 17:36:10.000000000 +0100
-+++ php-4.3.3RC3/ext/sybase/config.m4  2003-08-16 16:11:52.854216712 +0200
+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)
@@ -8,29 +9,3 @@
    AC_CHECK_LIB(dnet_stub, dnet_addr,
       [ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,SYBASE_SHARED_LIBADD)
          AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])
---- php-4.3.3/ext/sybase/php_sybase_db.c.orig  Tue Aug  5 18:02:37 2003
-+++ php-4.3.3/ext/sybase/php_sybase_db.c       Tue Aug 26 10:20:37 2003
-@@ -143,6 +143,7 @@
- static int php_sybase_error_handler(DBPROCESS *dbproc,int severity,int dberr,
-                                                                               int oserr,char *dberrstr,char *oserrstr)
- {
-+      TSRMLS_FETCH();
-       if (severity >= php_sybase_module.min_error_severity) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase error:  %s (severity %d)",dberrstr,severity);
-       }
-@@ -154,6 +155,7 @@
-                                                                               int severity,char *msgtext,char *srvname,
-                                                                               char *procname,DBUSMALLINT line)
- {
-+      TSRMLS_FETCH();
-       if (severity >= php_sybase_module.min_message_severity) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase message:  %s (severity %d)",msgtext,severity);
-       }
-@@ -746,6 +748,7 @@
-                               Z_STRVAL_P(result) = res_buf;
-                               Z_TYPE_P(result) = IS_STRING;
-                       } else {
-+                              TSRMLS_FETCH();
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  column %d has unknown data type (%d)", offset, coltype(offset));
-                               ZVAL_FALSE(result);
-                       }