MFH: - Fixed bug #22580 (ext/odbc compile failure with dbmaker)

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index fd1ee8c574ba270b54cb5c3b8b1e4ff53943dad0..01a2da456841b7f5e90d6b331785ac8df5c62777 100644 (file)
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -538,6 +538,7 @@ if test -n "$ODBC_TYPE"; then
   if test "$ODBC_TYPE" != "dbmaker"; then
     ext_shared=$shared
     PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD)
+    AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ])
   fi
 
   AC_DEFINE(HAVE_UODBC,1,[ ])

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 7415e853bd7629e27220308eb7986554a2b914fd..7431014fff69307bce9c7b732f589f4cf7e8283b 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -79,7 +79,9 @@ function_entry odbc_functions[] = {
        PHP_FE(odbc_commit, NULL)
        PHP_FE(odbc_connect, NULL)
        PHP_FE(odbc_cursor, NULL)
+#ifdef HAVE_SQLDATASOURCES
        PHP_FE(odbc_data_source, NULL)
+#endif
        PHP_FE(odbc_execute, NULL)
        PHP_FE(odbc_error, NULL)
        PHP_FE(odbc_errormsg, NULL)
@@ -1183,6 +1185,7 @@ PHP_FUNCTION(odbc_cursor)
 }
 /* }}} */
 
+#ifdef HAVE_SQLDATASOURCES
 /* {{{ proto array odbc_data_source(int connection_id, int fetch_type)
    Return information about the currently connected data source */
 PHP_FUNCTION(odbc_data_source)
@@ -1243,6 +1246,7 @@ PHP_FUNCTION(odbc_data_source)
 
 }
 /* }}} */
+#endif /* HAVE_SQLDATASOURCES *
 
 /* {{{ proto int odbc_exec(int connection_id, string query [, int flags])
    Prepare and execute an SQL statement */

diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h
index 24b5a0db81a46cf16cd9b6ab5885bcded3860bad..d7d2002fd2fdb8bf70f73b9c748bd93e2acf56ca 100644 (file)
--- a/ext/odbc/php_odbc.h
+++ b/ext/odbc/php_odbc.h
@@ -54,7 +54,9 @@ PHP_FUNCTION(odbc_commit);
 PHP_FUNCTION(odbc_connect);
 PHP_FUNCTION(odbc_pconnect);
 PHP_FUNCTION(odbc_cursor);
+#ifdef HAVE_SQLDATASOURCES
 PHP_FUNCTION(odbc_data_source);
+#endif
 PHP_FUNCTION(odbc_do);
 PHP_FUNCTION(odbc_exec);
 PHP_FUNCTION(odbc_execute);