diff options
| -rw-r--r-- | ext/fbsql/php_fbsql.h | 6 | ||||
| -rw-r--r-- | ext/mssql/php_mssql.c | 2 | ||||
| -rw-r--r-- | ext/mssql/php_mssql.h | 9 |
3 files changed, 9 insertions, 8 deletions
diff --git a/ext/fbsql/php_fbsql.h b/ext/fbsql/php_fbsql.h index 118ff5b68d..1d910e2984 100644 --- a/ext/fbsql/php_fbsql.h +++ b/ext/fbsql/php_fbsql.h @@ -105,9 +105,9 @@ static void php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type); static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent); ZEND_BEGIN_MODULE_GLOBALS(fbsql) - long allowPersistent; - long generateWarnings; - long autoCommit; + zend_bool allowPersistent; + zend_bool generateWarnings; + zend_bool autoCommit; long maxPersistent; long maxLinks; long maxConnections; diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index bf539364cb..8f44e8e45b 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -446,7 +446,7 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) DBMSGHANDLE(mssql.login, (MHANDLEFUNC) php_mssql_message_handler); #ifndef HAVE_FREETDS - if (MS_SQL_G(secure_connection) == 1){ + if (MS_SQL_G(secure_connection)){ DBSETLSECURE(mssql.login); } else { diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h index f663666e24..9a134bad52 100644 --- a/ext/mssql/php_mssql.h +++ b/ext/mssql/php_mssql.h @@ -149,17 +149,18 @@ ZEND_BEGIN_MODULE_GLOBALS(mssql) long default_link; long num_links,num_persistent; long max_links,max_persistent; - long allow_persistent; + zend_bool allow_persistent; char *appname; char *server_message; long min_error_severity, min_message_severity; long cfg_min_error_severity, cfg_min_message_severity; - long compatability_mode, connect_timeout, timeout; + long connect_timeout, timeout; + zend_bool compatability_mode; void (*get_column_content)(mssql_link *mssql_ptr,int offset,pval *result,int column_type TSRMLS_DC); long textsize, textlimit, batchsize; - long datetimeconvert; + zend_bool datetimeconvert; HashTable *resource_list, *resource_plist; - long secure_connection; + zend_bool secure_connection; long max_procs; ZEND_END_MODULE_GLOBALS(mssql) |