dmitry Wed Jun 14 05:51:16 2006 UTC
Modified files:
/php-src/ext/odbc php_odbc.c php_odbc_includes.h
Log:
Fixed compilation (automatic module globals management).
http://cvs.php.net/viewcvs.cgi/php-src/ext/odbc/php_odbc.c?r1=1.195&r2=1.196&diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.195 php-src/ext/odbc/php_odbc.c:1.196
--- php-src/ext/odbc/php_odbc.c:1.195 Tue Jun 13 13:12:19 2006
+++ php-src/ext/odbc/php_odbc.c Wed Jun 14 05:51:16 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.195 2006/06/13 13:12:19 dmitry Exp $ */
+/* $Id: php_odbc.c,v 1.196 2006/06/14 05:51:16 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -384,23 +384,23 @@
*/
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()
/* }}} */
http://cvs.php.net/viewcvs.cgi/php-src/ext/odbc/php_odbc_includes.h?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/odbc/php_odbc_includes.h
diff -u php-src/ext/odbc/php_odbc_includes.h:1.13
php-src/ext/odbc/php_odbc_includes.h:1.14
--- php-src/ext/odbc/php_odbc_includes.h:1.13 Sun Jan 1 13:09:52 2006
+++ php-src/ext/odbc/php_odbc_includes.h Wed Jun 14 05:51:16 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc_includes.h,v 1.13 2006/01/01 13:09:52 sniper Exp $ */
+/* $Id: php_odbc_includes.h,v 1.14 2006/06/14 05:51:16 dmitry Exp $ */
#ifndef PHP_ODBC_INCLUDES_H
#define PHP_ODBC_INCLUDES_H
@@ -249,7 +249,7 @@
odbc_connection *conn_ptr;
} odbc_result;
-typedef struct {
+ZEND_BEGIN_MODULE_GLOBALS(odbc)
char *defDB;
char *defUser;
char *defPW;
@@ -266,7 +266,7 @@
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 @@
#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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
