summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/apache/apache.c12
-rw-r--r--ext/mysql/mysql.c18
-rw-r--r--ext/odbc/odbc.c20
-rw-r--r--ext/rpc/com/COM.c4
-rw-r--r--ext/standard/basic_functions.c4
5 files changed, 29 insertions, 29 deletions
diff --git a/ext/apache/apache.c b/ext/apache/apache.c
index 1fe384e286..c5085f749e 100644
--- a/ext/apache/apache.c
+++ b/ext/apache/apache.c
@@ -72,7 +72,7 @@ static PHP_INI_MH(OnChangeApacheInt)
long *p;
char *base = (char *) &php_apache_info;
- p = (long *) (base+(size_t) mh_arg);
+ p = (long *) (base+(size_t) mh_arg1);
if (new_value) {
*p = atoi(new_value);
@@ -88,7 +88,7 @@ static PHP_INI_MH(OnChangeApacheString)
char **p;
char *base = (char *) &php_apache_info;
- p = (char **) (base+(size_t) mh_arg);
+ p = (char **) (base+(size_t) mh_arg1);
if (new_value) {
*p = new_value;
@@ -99,10 +99,10 @@ static PHP_INI_MH(OnChangeApacheString)
}
PHP_INI_BEGIN()
- PHP_INI_ENTRY("xbithack", "0", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, xbithack))
- PHP_INI_ENTRY("engine", "1", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, engine))
- PHP_INI_ENTRY("last_modified", "0", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, last_modified))
- PHP_INI_ENTRY("dav_script", NULL, PHP_INI_ALL, OnChangeApacheString, (void *) XtOffsetOf(php_apache_info_struct, dav_script))
+ PHP_INI_ENTRY1("xbithack", "0", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, xbithack))
+ PHP_INI_ENTRY1("engine", "1", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, engine))
+ PHP_INI_ENTRY1("last_modified", "0", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, last_modified))
+ PHP_INI_ENTRY1("dav_script", NULL, PHP_INI_ALL, OnChangeApacheString, (void *) XtOffsetOf(php_apache_info_struct, dav_script))
PHP_INI_END()
diff --git a/ext/mysql/mysql.c b/ext/mysql/mysql.c
index 46991bb0ba..5e4c257af2 100644
--- a/ext/mysql/mysql.c
+++ b/ext/mysql/mysql.c
@@ -239,7 +239,7 @@ static PHP_INI_MH(OnMySQLInt)
base = (char *) mysql_globals;
#endif
- p = (long *) (base+(size_t) mh_arg);
+ p = (long *) (base+(size_t) mh_arg1);
*p = atoi(new_value);
return SUCCESS;
@@ -258,7 +258,7 @@ static PHP_INI_MH(OnMySQLStr)
base = (char *) mysql_globals;
#endif
- p = (char **) (base+(size_t) mh_arg);
+ p = (char **) (base+(size_t) mh_arg1);
*p = new_value;
return SUCCESS;
@@ -292,13 +292,13 @@ static PHP_INI_MH(OnMySQLPort)
PHP_INI_BEGIN()
- PHP_INI_ENTRY("mysql.allow_persistent", "1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, allow_persistent))
- PHP_INI_ENTRY("mysql.max_persistent", "-1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, max_persistent))
- PHP_INI_ENTRY("mysql.max_links", "-1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, max_links))
- PHP_INI_ENTRY("mysql.default_host", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_host))
- PHP_INI_ENTRY("mysql.default_user", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_user))
- PHP_INI_ENTRY("mysql.default_password", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_password))
- PHP_INI_ENTRY("mysql.default_port", NULL, PHP_INI_ALL, OnMySQLPort, NULL)
+ PHP_INI_ENTRY1("mysql.allow_persistent", "1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, allow_persistent))
+ PHP_INI_ENTRY1("mysql.max_persistent", "-1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, max_persistent))
+ PHP_INI_ENTRY1("mysql.max_links", "-1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, max_links))
+ PHP_INI_ENTRY1("mysql.default_host", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_host))
+ PHP_INI_ENTRY1("mysql.default_user", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_user))
+ PHP_INI_ENTRY1("mysql.default_password", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_password))
+ PHP_INI_ENTRY1("mysql.default_port", NULL, PHP_INI_ALL, OnMySQLPort, NULL)
PHP_INI_END()
diff --git a/ext/odbc/odbc.c b/ext/odbc/odbc.c
index 0ef444adb2..768af90802 100644
--- a/ext/odbc/odbc.c
+++ b/ext/odbc/odbc.c
@@ -189,7 +189,7 @@ static PHP_INI_MH(odbc_param_int)
long *p;
ODBC_TLS_VARS;
- p = (long *) (globals + (size_t)mh_arg);
+ p = (long *) (globals + (size_t)mh_arg1);
*p = atoi(new_value);
return SUCCESS;
@@ -201,7 +201,7 @@ static PHP_INI_MH(odbc_param_str)
char **p;
ODBC_TLS_VARS;
- p = (char **) (globals + (size_t)mh_arg);
+ p = (char **) (globals + (size_t)mh_arg1);
*p = new_value;
return SUCCESS;
@@ -209,14 +209,14 @@ static PHP_INI_MH(odbc_param_str)
PHP_INI_BEGIN()
- PHP_INI_ENTRY("odbc.allow_persistent", "1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, allow_persistent))
- PHP_INI_ENTRY("odbc.max_persistent", "-1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, max_persistent))
- PHP_INI_ENTRY("odbc.max_links", "-1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, max_links))
- PHP_INI_ENTRY("odbc.default_db", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defDB))
- PHP_INI_ENTRY("odbc.default_user", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defUser))
- PHP_INI_ENTRY("odbc.default_pw", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defPW))
- PHP_INI_ENTRY("odbc.defaultlrl", "4096", PHP_INI_ALL, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, defaultlrl))
- PHP_INI_ENTRY("odbc.defaultbinmode", "1", PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defPW))
+ PHP_INI_ENTRY1("odbc.allow_persistent", "1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, allow_persistent))
+ PHP_INI_ENTRY1("odbc.max_persistent", "-1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, max_persistent))
+ PHP_INI_ENTRY1("odbc.max_links", "-1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, max_links))
+ PHP_INI_ENTRY1("odbc.default_db", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defDB))
+ PHP_INI_ENTRY1("odbc.default_user", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defUser))
+ PHP_INI_ENTRY1("odbc.default_pw", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defPW))
+ PHP_INI_ENTRY1("odbc.defaultlrl", "4096", PHP_INI_ALL, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, defaultlrl))
+ PHP_INI_ENTRY1("odbc.defaultbinmode", "1", PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defPW))
PHP_INI_END()
diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c
index 17e4a28f3b..919e8ec21c 100644
--- a/ext/rpc/com/COM.c
+++ b/ext/rpc/com/COM.c
@@ -213,8 +213,8 @@ static PHP_INI_MH(OnTypelibFileChange)
PHP_INI_BEGIN()
- PHP_INI_ENTRY("allow_dcom", "0", PHP_INI_SYSTEM, NULL, NULL)
- PHP_INI_ENTRY("typelib_file", NULL, PHP_INI_SYSTEM, OnTypelibFileChange, NULL)
+ PHP_INI_ENTRY1("allow_dcom", "0", PHP_INI_SYSTEM, NULL, NULL)
+ PHP_INI_ENTRY1("typelib_file", NULL, PHP_INI_SYSTEM, OnTypelibFileChange, NULL)
PHP_INI_END()
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 26451856a0..6ed4496eb5 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -297,8 +297,8 @@ function_entry basic_functions[] = {
PHP_INI_BEGIN()
- PHP_INI_ENTRY("highlight.string", "#foobar", PHP_INI_ALL, NULL, NULL)
- PHP_INI_ENTRY("test2", "testing", PHP_INI_SYSTEM, NULL, NULL)
+ PHP_INI_ENTRY1("highlight.string", "#foobar", PHP_INI_ALL, NULL, NULL)
+ PHP_INI_ENTRY1("test2", "testing", PHP_INI_SYSTEM, NULL, NULL)
PHP_INI_END()
View Lorry Controller Status