Skip to content

Commit b741e1b

Browse files
committed
All driver managers support SQLDataSources now too
So we don't need the define?
1 parent d8050d8 commit b741e1b

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
@@ -119,9 +119,6 @@ PHP_ARG_WITH([unixODBC],
119119
dnl Extension setup
120120
if test -n "$ODBC_TYPE"; then
121121
PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], [ODBC_SHARED_LIBADD])
122-
AC_DEFINE([HAVE_SQLDATASOURCES], [1],
123-
[Define to 1 if ODBC library has 'SQLDataSources', as a function or
124-
macro.])
125122

126123
AC_DEFINE([HAVE_UODBC], [1],
127124
[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
@@ -8,7 +8,6 @@ if (PHP_ODBC == "yes") {
88
&& CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_ODBC")) {
99
EXTENSION("odbc", "php_odbc.c odbc_utils.c", PHP_ODBC_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
1010
AC_DEFINE("HAVE_UODBC", 1, "Define to 1 if the PHP extension 'odbc' is available.");
11-
AC_DEFINE("HAVE_SQLDATASOURCES", 1, "Define to 1 if ODBC library has 'SQLDataSources', as a function or macro.");
1211
} else {
1312
WARNING("odbc support can't be enabled, libraries or header are missing (SDK)")
1413
PHP_ODBC = "no"

ext/odbc/odbc.stub.php

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

338338
function odbc_cursor(Odbc\Result $statement): string|false {}
339339

340-
#ifdef HAVE_SQLDATASOURCES
341340
function odbc_data_source(Odbc\Connection $odbc, int $fetch_type): array|null|false {}
342-
#endif
343341

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

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
@@ -1186,7 +1186,6 @@ PHP_FUNCTION(odbc_cursor)
11861186
}
11871187
/* }}} */
11881188

1189-
#ifdef HAVE_SQLDATASOURCES
11901189
/* {{{ Return information about the currently connected data source */
11911190
PHP_FUNCTION(odbc_data_source)
11921191
{
@@ -1242,7 +1241,6 @@ PHP_FUNCTION(odbc_data_source)
12421241

12431242
}
12441243
/* }}} */
1245-
#endif /* HAVE_SQLDATASOURCES */
12461244

12471245
/* {{{ Prepare and execute an SQL statement */
12481246
/* XXX Use flags */

0 commit comments

Comments
 (0)