Commit:    7549beb1022c6821a279df03e0dfcbf0df5eef97
Author:    Felipe Pena <felipe...@gmail.com>         Wed, 3 Jul 2013 15:02:03 
-0300
Parents:   5bc7e597d990eb3c38d07c0189d27c246c7b4ae5
Branches:  PHP-5.4 PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=7549beb1022c6821a279df03e0dfcbf0df5eef97

Log:
- Fixed build on FreeTDS 0.82

Changed paths:
  M  ext/pdo_dblib/dblib_driver.c


Diff:
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index 9ed5087..c54cd73 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -274,9 +274,13 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval 
*driver_options TSRMLS_
                ,{"5.0",DBVERSION_70} /* FIXME: This does not work with Sybase, 
but environ will */
                ,{"6.0",DBVERSION_70}
                ,{"7.0",DBVERSION_70}
+#ifdef DBVERSION_71
                ,{"7.1",DBVERSION_71}
+#endif
+#ifdef DBVERSION_72
                ,{"7.2",DBVERSION_72}
                ,{"8.0",DBVERSION_72}
+#endif
                ,{"10.0",DBVERSION_100}
                ,{"auto",0} /* Only works with FreeTDS. Other drivers will bork 
*/
                
@@ -361,9 +365,11 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval 
*driver_options TSRMLS_
        /* allow double quoted indentifiers */
        DBSETOPT(H->link, DBQUOTEDIDENT, "1");
 
+#ifdef DBSETLDBNAME
        if (vars[3].optval) {
                DBSETLDBNAME(H->login, vars[3].optval);
        }
+#endif
 
        ret = 1;
        dbh->max_escaped_char_length = 2;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to