cvs: php4 /ext/sybase config.m4 php_sybase_db.c
| From: | Andi Gutmans | Date: | Wed, 02 May 2001 18:38:15 +0000 |
| Subject: | cvs: php4 /ext/sybase config.m4 php_sybase_db.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5462@lists.php.net to get a copy of this message | ||
andi Wed May 2 11:38:15 2001 EDT
Modified files:
/php4/ext/sybase config.m4 php_sybase_db.c
Log:
- Apply Vlad's sybase patch to work with two different kinds of builds of
the sybase libraries
Index: php4/ext/sybase/config.m4
diff -u php4/ext/sybase/config.m4:1.7 php4/ext/sybase/config.m4:1.8
--- php4/ext/sybase/config.m4:1.7 Tue Mar 27 12:34:43 2001
+++ php4/ext/sybase/config.m4 Wed May 2 11:38:14 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.7 2001/03/27 20:34:43 sniper Exp $
+dnl $Id: config.m4,v 1.8 2001/05/02 18:38:14 andi Exp $
PHP_ARG_WITH(sybase,for Sybase support,
[ --with-sybase[=DIR] Include Sybase-DB support. DIR is the Sybase home
@@ -21,4 +21,8 @@
AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])
])
AC_DEFINE(HAVE_SYBASE,1,[ ])
+ AC_CHECK_LIB(sybdb, tdsdbopen,
+ [ AC_DEFINE(PHP_SYBASE_DBOPEN,tdsdbopen,[ ])
+ AC_DEFINE(DBMFIX,1,[ ]) ],
+ [ AC_DEFINE(PHP_SYBASE_DBOPEN,dbopen,[ ]) ])
fi
Index: php4/ext/sybase/php_sybase_db.c
diff -u php4/ext/sybase/php_sybase_db.c:1.13 php4/ext/sybase/php_sybase_db.c:1.14
--- php4/ext/sybase/php_sybase_db.c:1.13 Thu Mar 15 17:21:31 2001
+++ php4/ext/sybase/php_sybase_db.c Wed May 2 11:38:14 2001
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_db.c,v 1.13 2001/03/16 01:21:31 camber Exp $ */
+/* $Id: php_sybase_db.c,v 1.14 2001/05/02 18:38:14 andi Exp $ */
#include "php.h"
@@ -381,7 +381,7 @@
RETURN_FALSE;
}
/* create the link */
- if ((sybase.link=dbopen(sybase.login,host))==FAIL) {
+ if ((sybase.link=PHP_SYBASE_DBOPEN(sybase.login,host))==FAIL) {
/*php_error(E_WARNING,"Sybase: Unable to connect to server:
%s",sybase_error(sybase));*/
efree(hashed_details);
dbloginfree(sybase.login);
@@ -417,7 +417,7 @@
sybase_ptr = (sybase_link *) le->ptr;
/* test that the link hasn't died */
if (DBDEAD(sybase_ptr->link)==TRUE) {
- if ((sybase_ptr->link=dbopen(sybase_ptr->login,host))==FAIL) {
+ if ((sybase_ptr->link=PHP_SYBASE_DBOPEN(sybase_ptr->login,host))==FAIL) {
/*php_error(E_WARNING,"Sybase: Link to server lost, unable to reconnect");*/
zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1);
efree(hashed_details);
@@ -464,7 +464,7 @@
RETURN_FALSE;
}
- if ((sybase.link=dbopen(sybase.login,host))==NULL) {
+ if ((sybase.link=PHP_SYBASE_DBOPEN(sybase.login,host))==NULL) {
/*php_error(E_WARNING,"Sybase: Unable to connect to server:
%s",sybase_error(sybase));*/
efree(hashed_details);
RETURN_FALSE;