clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Apply Vlad's sybase patch to work with two different kinds of builds of

Browse Source 
the sybase libraries
This commit is contained in:
Andi Gutmans 2001-05-02 18:38:17 +00:00
parent ec1f342fac
commit 5965588963
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/sybase/config.m4
View File

@ -21,4 +21,8 @@ if test "$PHP_SYBASE" != "no"; then
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

6
ext/sybase/php_sybase_db.c
View File

@ -381,7 +381,7 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
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 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
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 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
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;