diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-02-01 21:25:15 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-02-01 21:25:15 +0100 |
| commit | 96fb2ff5760132a915766f1d9ec7c63001feacd8 (patch) | |
| tree | 160904a89a8f3522fa4e47632db101b045e7814a /ext/pdo_odbc | |
| parent | 8f1428d29ef91d74b4d272af171675f2971eb15b (diff) | |
| download | php-96fb2ff5760132a915766f1d9ec7c63001feacd8.tar.gz | |
Imported Upstream version 5.4.0~rc6upstream/5.4.0_rc6
Diffstat (limited to 'ext/pdo_odbc')
| -rwxr-xr-x | ext/pdo_odbc/config.m4 | 12 | ||||
| -rwxr-xr-x | ext/pdo_odbc/pdo_odbc.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4 index 90086e356..6adaa3142 100755 --- a/ext/pdo_odbc/config.m4 +++ b/ext/pdo_odbc/config.m4 @@ -1,4 +1,4 @@ -dnl $Id: config.m4 311041 2011-05-15 05:49:34Z rasmus $ +dnl $Id: config.m4 311040 2011-05-15 05:24:34Z rasmus $ dnl config.m4 for extension pdo_odbc dnl vim:et:sw=2:ts=2: @@ -47,15 +47,15 @@ if test "$PHP_PDO_ODBC" != "no"; then ],[ AC_MSG_CHECKING([for PDO includes]) if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$prefix/include/php/ext + pdo_cv_inc_path=$prefix/include/php/ext else AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi - AC_MSG_RESULT($pdo_inc_path) + AC_MSG_RESULT($pdo_cv_inc_path) ]) AC_MSG_CHECKING([for selected PDO ODBC flavour]) @@ -165,7 +165,7 @@ functions required for PDO support. AC_MSG_ERROR([Your ODBC library does not exist or there was an error. Check config.log for more information]) ], $PDO_ODBC_LDFLAGS) - PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_inc_path $PDO_ODBC_INCLUDE) + PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_ODBC_INCLUDE) PHP_SUBST(PDO_ODBC_SHARED_LIBADD) ifdef([PHP_ADD_EXTENSION_DEP], [ diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c index 31e4403ae..4b4561eae 100755 --- a/ext/pdo_odbc/pdo_odbc.c +++ b/ext/pdo_odbc/pdo_odbc.c @@ -31,8 +31,8 @@ #include "php_pdo_odbc_int.h" /* {{{ pdo_odbc_functions[] */ -const function_entry pdo_odbc_functions[] = { - {NULL, NULL, NULL} +const zend_function_entry pdo_odbc_functions[] = { + PHP_FE_END }; /* }}} */ |