Skip to content

Commit 4f84174

Browse files
committed
All driver managers support SQLDataSources now too
So we don't need the define?
1 parent 38d9adc commit 4f84174

File tree

5 files changed

+1
-15
lines changed

5 files changed

+1
-15
lines changed

ext/odbc/config.m4

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,6 @@ AS_VAR_IF([PHP_ODBCVER], [no],
131131
dnl Extension setup
132132
if test -n "$ODBC_TYPE"; then
133133
PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], [ODBC_SHARED_LIBADD])
134-
AC_DEFINE([HAVE_SQLDATASOURCES], [1],
135-
[Define to 1 if ODBC library has 'SQLDataSources', as a function or
136-
macro.])
137134

138135
AC_DEFINE([HAVE_UODBC], [1],
139136
[Define to 1 if the PHP extension 'odbc' is available.])

ext/odbc/config.w32

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ if (PHP_ODBC == "yes") {
99
&& CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_ODBC")) {
1010
EXTENSION("odbc", "php_odbc.c odbc_utils.c", PHP_ODBC_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
1111
AC_DEFINE("HAVE_UODBC", 1, "Define to 1 if the PHP extension 'odbc' is available.");
12-
AC_DEFINE("HAVE_SQLDATASOURCES", 1, "Define to 1 if ODBC library has 'SQLDataSources', as a function or macro.");
1312
if ("no" == PHP_ODBCVER) {
1413
AC_DEFINE("ODBCVER", "0x0350", "The highest supported ODBC version.", false);
1514
} else if ("0" != PHP_ODBCVER) {

ext/odbc/odbc.stub.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,7 @@ function odbc_execute(Odbc\Result $statement, array $params = []): bool {}
341341

342342
function odbc_cursor(Odbc\Result $statement): string|false {}
343343

344-
#ifdef HAVE_SQLDATASOURCES
345344
function odbc_data_source(Odbc\Connection $odbc, int $fetch_type): array|null|false {}
346-
#endif
347345

348346
function odbc_exec(Odbc\Connection $odbc, string $query): Odbc\Result|false {}
349347

ext/odbc/odbc_arginfo.h

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/odbc/php_odbc.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,6 @@ PHP_FUNCTION(odbc_cursor)
11991199
}
12001200
/* }}} */
12011201

1202-
#ifdef HAVE_SQLDATASOURCES
12031202
/* {{{ Return information about the currently connected data source */
12041203
PHP_FUNCTION(odbc_data_source)
12051204
{
@@ -1255,7 +1254,6 @@ PHP_FUNCTION(odbc_data_source)
12551254

12561255
}
12571256
/* }}} */
1258-
#endif /* HAVE_SQLDATASOURCES */
12591257

12601258
/* {{{ Prepare and execute an SQL statement */
12611259
/* XXX Use flags */

0 commit comments

Comments
 (0)