diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-06-14 05:51:16 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-06-14 05:51:16 +0000 |
| commit | 441d051bcda48a7fbd2dc15c4ad2da4d116fa85e (patch) | |
| tree | 18aeaf63303aa8b533b91c1338ae8c2778d0663c /ext/odbc | |
| parent | a093762a6fd2fa1a4e0fe6754fa9432d8ed2cc16 (diff) | |
| download | php-git-441d051bcda48a7fbd2dc15c4ad2da4d116fa85e.tar.gz | |
Fixed compilation (automatic module globals management).
Diffstat (limited to 'ext/odbc')
| -rw-r--r-- | ext/odbc/php_odbc.c | 18 | ||||
| -rw-r--r-- | ext/odbc/php_odbc_includes.h | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 65eeff05b0..41a36e8098 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -384,23 +384,23 @@ static PHP_INI_DISP(display_lrl) */ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("odbc.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateLong, - allow_persistent, php_odbc_globals, odbc_globals) + allow_persistent, zend_odbc_globals, odbc_globals) STD_PHP_INI_ENTRY_EX("odbc.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateLong, - max_persistent, php_odbc_globals, odbc_globals, display_link_nums) + max_persistent, zend_odbc_globals, odbc_globals, display_link_nums) STD_PHP_INI_ENTRY_EX("odbc.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, - max_links, php_odbc_globals, odbc_globals, display_link_nums) + max_links, zend_odbc_globals, odbc_globals, display_link_nums) STD_PHP_INI_ENTRY("odbc.default_db", NULL, PHP_INI_ALL, OnUpdateString, - defDB, php_odbc_globals, odbc_globals) + defDB, zend_odbc_globals, odbc_globals) STD_PHP_INI_ENTRY("odbc.default_user", NULL, PHP_INI_ALL, OnUpdateString, - defUser, php_odbc_globals, odbc_globals) + defUser, zend_odbc_globals, odbc_globals) STD_PHP_INI_ENTRY_EX("odbc.default_pw", NULL, PHP_INI_ALL, OnUpdateString, - defPW, php_odbc_globals, odbc_globals, display_defPW) + defPW, zend_odbc_globals, odbc_globals, display_defPW) STD_PHP_INI_ENTRY_EX("odbc.defaultlrl", "4096", PHP_INI_ALL, OnUpdateLong, - defaultlrl, php_odbc_globals, odbc_globals, display_lrl) + defaultlrl, zend_odbc_globals, odbc_globals, display_lrl) STD_PHP_INI_ENTRY_EX("odbc.defaultbinmode", "1", PHP_INI_ALL, OnUpdateLong, - defaultbinmode, php_odbc_globals, odbc_globals, display_binmode) + defaultbinmode, zend_odbc_globals, odbc_globals, display_binmode) STD_PHP_INI_BOOLEAN("odbc.check_persistent", "1", PHP_INI_SYSTEM, OnUpdateLong, - check_persistent, php_odbc_globals, odbc_globals) + check_persistent, zend_odbc_globals, odbc_globals) PHP_INI_END() /* }}} */ diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index d3ee4d5ea3..bdb67ec5d2 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -249,7 +249,7 @@ typedef struct odbc_result { odbc_connection *conn_ptr; } odbc_result; -typedef struct { +ZEND_BEGIN_MODULE_GLOBALS(odbc) char *defDB; char *defUser; char *defPW; @@ -266,7 +266,7 @@ typedef struct { char lasterrormsg[SQL_MAX_MESSAGE_LENGTH]; HashTable *resource_list; HashTable *resource_plist; -} php_odbc_globals; +ZEND_END_MODULE_GLOBALS(odbc) int odbc_add_result(HashTable *list, odbc_result *result); odbc_result *odbc_get_result(HashTable *list, int count); @@ -284,7 +284,7 @@ void odbc_sql_error(ODBC_SQL_ERROR_PARAMS); #define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY) #ifdef ZTS -# define ODBCG(v) TSRMG(odbc_globals_id, php_odbc_globals *, v) +# define ODBCG(v) TSRMG(odbc_globals_id, zend_odbc_globals *, v) #else # define ODBCG(v) (odbc_globals.v) extern ZEND_API php_odbc_globals odbc_globals; |