diff options
| author | mOo <moo.lighttpd@gmail.com> | 2005-08-23 14:35:01 +0000 |
|---|---|---|
| committer | mOo <moo.lighttpd@gmail.com> | 2005-08-23 14:35:01 +0000 |
| commit | f387d898702c05eac22045437c04562e00d466bb (patch) | |
| tree | 3cc28cc96977906c94b742517ee1c3272d31e620 /src/configfile.h | |
| parent | 9a2e65355720ec762564323a4be3302e949e046c (diff) | |
| download | lighttpd-git-f387d898702c05eac22045437c04562e00d466bb.tar.gz | |
fix merging of auto-indexing element, and make autoload modules hack to use array merging
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@616 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'src/configfile.h')
| -rw-r--r-- | src/configfile.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/configfile.h b/src/configfile.h index a58a257d..600297f6 100644 --- a/src/configfile.h +++ b/src/configfile.h @@ -19,5 +19,6 @@ void configparserFree(void *p, void (*freeProc)(void*)); void configparser(void *yyp, int yymajor, buffer *yyminor, config_t *ctx); int config_parse_file(server *srv, config_t *context, const char *fn); int config_parse_cmd(server *srv, config_t *context, const char *cmd); +data_unset *configparser_merge_data(data_unset *op1, const data_unset *op2); #endif |