This change seems to fix bugs 7158, 7807, 8531, and 8636. After asking why this...

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index ffa4d4101381562fad19aa6d57d0e640a5cddca2..b0c4e841e2ecad12c29aa7b17377156175563c00 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2435,11 +2435,7 @@ PHP_FUNCTION(odbc_autocommit)
 
        ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
        
-#ifndef HAVE_DBMAKER   
-       if ((*pv_onoff)) {
-#else
        if (pv_onoff && (*pv_onoff)) {
-#endif
                convert_to_long_ex(pv_onoff);
                rc = SQLSetConnectOption(conn->hdbc, SQL_AUTOCOMMIT,
                                                                 ((*pv_onoff)->value.lval) ?