summaryrefslogtreecommitdiff
path: root/ext/odbc
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-07-30 01:56:43 +0000
committerZeev Suraski <zeev@php.net>2001-07-30 01:56:43 +0000
commit1c25b8dd532961ecb09932b182457ca0adcf8b57 (patch)
tree2996afec821096218156f1d914301ad589edf897 /ext/odbc
parentb57703825be0ff40d34ee257ce14c453c4bffb98 (diff)
downloadphp-git-1c25b8dd532961ecb09932b182457ca0adcf8b57.tar.gz
Avoid TSRMLS_FETCH()'s, and clean up a bit of stale extern's and layout on the way
Diffstat (limited to 'ext/odbc')
-rw-r--r--ext/odbc/php_odbc.h8
-rw-r--r--ext/odbc/php_velocis.h6
-rw-r--r--ext/odbc/velocis.c1
3 files changed, 8 insertions, 7 deletions
diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h
index 23bbde9b7b..5d597e9607 100644
--- a/ext/odbc/php_odbc.h
+++ b/ext/odbc/php_odbc.h
@@ -186,10 +186,10 @@ extern zend_module_entry odbc_module_entry;
/* user functions */
-extern PHP_MINIT_FUNCTION(odbc);
-extern PHP_MSHUTDOWN_FUNCTION(odbc);
-extern PHP_RINIT_FUNCTION(odbc);
-extern PHP_RSHUTDOWN_FUNCTION(odbc);
+PHP_MINIT_FUNCTION(odbc);
+PHP_MSHUTDOWN_FUNCTION(odbc);
+PHP_RINIT_FUNCTION(odbc);
+PHP_RSHUTDOWN_FUNCTION(odbc);
PHP_MINFO_FUNCTION(odbc);
PHP_FUNCTION(odbc_error);
diff --git a/ext/odbc/php_velocis.h b/ext/odbc/php_velocis.h
index 0ac48f43d5..109795255b 100644
--- a/ext/odbc/php_velocis.h
+++ b/ext/odbc/php_velocis.h
@@ -57,10 +57,10 @@ extern zend_module_entry velocis_module_entry;
#define velocis_module_ptr &velocis_module_entry
/* velocis.c functions */
-extern PHP_MINIT_FUNCTION(velocis);
-extern PHP_RINIT_FUNCTION(velocis);
+PHP_MINIT_FUNCTION(velocis);
+PHP_RINIT_FUNCTION(velocis);
PHP_MINFO_FUNCTION(velocis);
-extern PHP_MSHUTDOWN_FUNCTION(velocis);
+PHP_MSHUTDOWN_FUNCTION(velocis);
PHP_FUNCTION(velocis_connect);
PHP_FUNCTION(velocis_close);
diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c
index 1491cb0239..5d47f0edb4 100644
--- a/ext/odbc/velocis.c
+++ b/ext/odbc/velocis.c
@@ -104,6 +104,7 @@ static void _free_velocis_result(zend_rsrc_list_entry *rsrc)
PHP_MINIT_FUNCTION(velocis)
{
SQLAllocEnv(&henv);
+
if ( cfg_get_long("velocis.max_links",&php_velocis_module.max_links) == FAILURE ) {
php_velocis_module.max_links = -1;
}