From: Dan Kalowsky <kalowsky@php.net>
Date: Tue, 17 Apr 2001 02:02:36 +0000 (+0000)
Subject: This change seems to fix bugs 7158, 7807, 8531, and 8636.  After asking why this... 
X-Git-Tag: php-4.0.6RC1~392
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=685186f9fde754e7f2bb4906ed22c1249b36e475;p=php

This change seems to fix bugs 7158, 7807, 8531, and 8636.  After asking why this patch was applied no one seemed to respond with anything useful.  If you find this change in error, sorry, I tested it on as many systems as I could.
---

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index ffa4d41013..b0c4e841e2 100644
--- 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) ?