CVS update: php31/main
| From: | zeev | Date: | Fri, 21 Aug 1998 20:03:38 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-443@lists.php.net to get a copy of this message | ||
Date: Friday August 21, 1998 @ 16:03
Author: zeev
Update of /repository/php31/main
In directory asf:/tmp/cvs-serv2602/main
Modified Files:
automated_configuration_definitions.h
Log Message:
Make VC happy
Index: php31/main/automated_configuration_definitions.h
diff -c php31/main/automated_configuration_definitions.h:2.1
php31/main/automated_configuration_definitions.h:2.2
*** php31/main/automated_configuration_definitions.h:2.1 Fri Aug 21 13:37:06 1998
--- php31/main/automated_configuration_definitions.h Fri Aug 21 16:03:38 1998
***************
*** 35,41 ****
#undef BEGIN_INI_TABLE
#undef END_INI_TABLE
! #undef FULL_INI_ENTRY
#undef AC_LONG
#undef AC_DOUBLE
#undef AC_STRING
--- 35,42 ----
#undef BEGIN_INI_TABLE
#undef END_INI_TABLE
! #undef INI_ENTRY
! #undef GROUP_INI_ENTRY
#undef AC_LONG
#undef AC_DOUBLE
#undef AC_STRING
***************
*** 58,65 ****
# define BEGIN_INI_TABLE() typedef struct {
# define END_INI_TABLE() } php3_ini_structure;
! # define FULL_INI_ENTRY(name, group_name, type, default_value, user_modifyable, description,
name_separator, variable_separator) \
! type group_name##variable_separator##name;
# define ACP_ALWAYS 0x1
--- 59,68 ----
# define BEGIN_INI_TABLE() typedef struct {
# define END_INI_TABLE() } php3_ini_structure;
! # define INI_ENTRY(name, type, default_value, user_modifyable, description) \
! type name;
! # define GROUP_INI_ENTRY(group_name, name, type, default_value, user_modifyable, description) \
! type group_name##_##name;
# define ACP_ALWAYS 0x1
***************
*** 108,115 ****
# define BEGIN_INI_TABLE() php3_ini_cache_entry[] = {
# define END_INI_TABLE() { NULL, NULL, 0, {0}, {0} } \
};
! # define FULL_INI_ENTRY(name, group_name, type, default_value, user_modifyable, description,
name_separator, variable_separator) \
! { #group_name #name_separator #name, &php3_ini.name, type, { default_value }, {0} },
# define ACP_ALWAYS 0x1
--- 111,120 ----
# define BEGIN_INI_TABLE() php3_ini_cache_entry[] = {
# define END_INI_TABLE() { NULL, NULL, 0, {0}, {0} } \
};
! # define INI_ENTRY(name, type, default_value, user_modifyable, description) \
! { #name, &php3_ini.name, type, { default_value }, {0} },
! # define GROUP_INI_ENTRY(group_name, name, type, default_value, user_modifyable, description) \
! { #group_name "." #name, &php3_ini.name, type, { default_value }, {0} },
# define ACP_ALWAYS 0x1
***************
*** 173,182 ****
return NULL; \
}
! # define FULL_INI_ENTRY(name, group_name, type, default_value, user_modifyable, description,
name_separator, variable_separator) \
case __LINE__: \
! php3_apache_command_handler_assign(cmd, (void *)
&conf->group_name##variable_separator##name, (void *) arg, type); \
break;
--- 178,191 ----
return NULL; \
}
! # define INI_ENTRY(name, type, default_value, user_modifyable, description) \
case __LINE__: \
! php3_apache_command_handler_assign(cmd, (void *) &conf->##name, (void *) arg, type); \
break;
+ # define GROUP_INI_ENTRY(group_name, name, type, default_value, user_modifyable, description) \
+ case __LINE__: \
+ php3_apache_command_handler_assign(cmd, (void *) &conf->group_name##_##name, (void *)
arg, type); \
+ break;
***************
*** 213,220 ****
# define BEGIN_INI_TABLE() command_rec php3_commands[] = {
# define END_INI_TABLE() { NULL, NULL, NULL, NULL, NULL, NULL } \
};
! # define FULL_INI_ENTRY(name, group_name, type, default_value, user_modifyable, description,
name_separator, variable_separator) \
! { "php3_" #group_name #variable_separator #name, php3_apache_command_handler, (void *)
__LINE__, user_modifyable, description)
# define ACP_ALWAYS OR_OPTIONS
# define SERVER_WIDE RSRC_CONF|ACCESS_CONF
--- 222,231 ----
# define BEGIN_INI_TABLE() command_rec php3_commands[] = {
# define END_INI_TABLE() { NULL, NULL, NULL, NULL, NULL, NULL } \
};
! # define INI_ENTRY(name, type, default_value, user_modifyable, description) \
! { "php3_" #name, php3_apache_command_handler, (void *) __LINE__, user_modifyable,
description)
! # define GROUP_INI_ENTRY(group_name, name, type, default_value, user_modifyable, description) \
! { "php3_" #group_name "." #name, php3_apache_command_handler, (void *)
__LINE__, user_modifyable, description)
# define ACP_ALWAYS OR_OPTIONS
# define SERVER_WIDE RSRC_CONF|ACCESS_CONF
***************
*** 245,257 ****
#else
# define BEGIN_INI_TABLE()
# define END_INI_TABLE()
! # define FULL_INI_ENTRY(name, group_name, type, default_value, user_modifyable, description,
name_separator, variable_separator)
! #endif
!
! #ifndef INI_ENTRY
! # define INI_ENTRY(name, type, default_value, user_modifyable, description) FULL_INI_ENTRY(name, ,
type, default_value, user_modifyable, description, , )
! #endif
!
! #ifndef GROUP_INI_ENTRY
! # define GROUP_INI_ENTRY(group_name, name, type, default_value, user_modifyable, description)
FULL_INI_ENTRY(name, group_name, type, default_value, user_modifyable, description, ., _)
#endif
--- 256,261 ----
#else
# define BEGIN_INI_TABLE()
# define END_INI_TABLE()
! # define INI_ENTRY(name, type, default_value, user_modifyable, description, name_separator,
variable_separator)
! # define GROUP_INI_ENTRY(group_name, name, type, default_value, user_modifyable, description,
name_separator, variable_separator)
#endif
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net