diff options
Diffstat (limited to 'ext/pdo_firebird')
| -rw-r--r-- | ext/pdo_firebird/config.m4 | 2 | ||||
| -rw-r--r-- | ext/pdo_firebird/config.w32 | 2 | ||||
| -rw-r--r-- | ext/pdo_firebird/firebird_statement.c | 4 | ||||
| -rw-r--r-- | ext/pdo_firebird/php_pdo_firebird_int.h | 2 | ||||
| -rw-r--r-- | ext/pdo_firebird/tests/skipif.inc | 2 | ||||
| -rw-r--r-- | ext/pdo_firebird/tests/testdb.inc | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4 index e6362cd7a0..0f7f3c7be8 100644 --- a/ext/pdo_firebird/config.m4 +++ b/ext/pdo_firebird/config.m4 @@ -55,7 +55,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_INCLUDE($FIREBIRD_INCDIR) fi - + PHP_CHECK_PDO_INCLUDES AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ]) diff --git a/ext/pdo_firebird/config.w32 b/ext/pdo_firebird/config.w32 index dc3ea0d17e..634ac4c8e9 100644 --- a/ext/pdo_firebird/config.w32 +++ b/ext/pdo_firebird/config.w32 @@ -6,7 +6,7 @@ if (PHP_PDO_FIREBIRD != "no") { if ((CHECK_LIB("fbclient_ms.lib", "pdo_firebird", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD) || CHECK_LIB("gds32_ms.lib", "pdo_firebird", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD) - ) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD", + ) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD", PHP_PHP_BUILD + "\\include\\interbase;" + PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD) ) { diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index 46dc10760a..1c0f5b6071 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -224,7 +224,7 @@ static int firebird_stmt_describe(pdo_stmt_t *stmt, int colno) /* {{{ */ switch (var->sqltype & ~1) { case SQL_SHORT: case SQL_LONG: -#if SIZEOF_ZEND_LONG >= 8 +#if SIZEOF_ZEND_LONG >= 8 case SQL_INT64: #endif col->param_type = PDO_PARAM_INT; @@ -399,7 +399,7 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{ *(zend_long *)*ptr = *(ISC_LONG*)var->sqldata; break; case SQL_INT64: -#if SIZEOF_ZEND_LONG >= 8 +#if SIZEOF_ZEND_LONG >= 8 *len = sizeof(zend_long); *ptr = FETCH_BUF(S->fetch_buf[colno], zend_long, 1, NULL); *(zend_long *)*ptr = *(ISC_INT64*)var->sqldata; diff --git a/ext/pdo_firebird/php_pdo_firebird_int.h b/ext/pdo_firebird/php_pdo_firebird_int.h index d0a48315d4..404b300ecc 100644 --- a/ext/pdo_firebird/php_pdo_firebird_int.h +++ b/ext/pdo_firebird/php_pdo_firebird_int.h @@ -62,7 +62,7 @@ typedef void (*info_func_t)(char*); #endif #if defined(_LP64) || defined(__LP64__) || defined(__arch64__) || defined(_WIN64) -# define PDO_FIREBIRD_HANDLE_INITIALIZER 0U +# define PDO_FIREBIRD_HANDLE_INITIALIZER 0U #else # define PDO_FIREBIRD_HANDLE_INITIALIZER NULL #endif diff --git a/ext/pdo_firebird/tests/skipif.inc b/ext/pdo_firebird/tests/skipif.inc index 5a6cd372d1..14b2ad4016 100644 --- a/ext/pdo_firebird/tests/skipif.inc +++ b/ext/pdo_firebird/tests/skipif.inc @@ -1,5 +1,5 @@ <?php /* $Id$ */ -if (!extension_loaded("interbase") || !extension_loaded("pdo_firebird")) print "skip"; +if (!extension_loaded("interbase") || !extension_loaded("pdo_firebird")) print "skip"; ?> diff --git a/ext/pdo_firebird/tests/testdb.inc b/ext/pdo_firebird/tests/testdb.inc index cbf2023094..e19ff9cb75 100644 --- a/ext/pdo_firebird/tests/testdb.inc +++ b/ext/pdo_firebird/tests/testdb.inc @@ -25,7 +25,7 @@ function init_db() function cleanup_db() { global $test_base; - + $r = ibase_connect($test_base); ibase_drop_db($r); } |