commit 890fc9659609396f9df4dff47a2be77cd652fe55
author Igor Sysoev <igor@sysoev.ru> Sun Jul 20 21:15:59 2003 +0000
committer Igor Sysoev <igor@sysoev.ru> Sun Jul 20 21:15:59 2003 +0000
tree b6694fd45d26bc9607ceb41608619dbbf4ccb23c
parent 8e1fbe61b69562d838aafda8d75798993f022d4a

nginx-0.0.1-2003-07-21-01:15:59 import

src/http/ngx_http_config.h

diff --git a/src/http/ngx_http_config.h b/src/http/ngx_http_config.h
index 50804c3..9d200c4 100644
--- a/src/http/ngx_http_config.h
+++ b/src/http/ngx_http_config.h
@@ -20,14 +20,14 @@
 
 
 typedef struct {
-    void  *(*create_main_conf)(ngx_pool_t *p);
-    char  *(*init_main_conf)(ngx_pool_t *p, void *conf);
+    void  *(*create_main_conf)(ngx_conf_t *cf);
+    char  *(*init_main_conf)(ngx_conf_t *cf, void *conf);
 
-    void  *(*create_srv_conf)(ngx_pool_t *p);
-    char  *(*merge_srv_conf)(ngx_pool_t *p, void *prev, void *conf);
+    void  *(*create_srv_conf)(ngx_conf_t *cf);
+    char  *(*merge_srv_conf)(ngx_conf_t *cf, void *prev, void *conf);
 
-    void  *(*create_loc_conf)(ngx_pool_t *p);
-    char  *(*merge_loc_conf)(ngx_pool_t *p, void *prev, void *conf);
+    void  *(*create_loc_conf)(ngx_conf_t *cf);
+    char  *(*merge_loc_conf)(ngx_conf_t *cf, void *prev, void *conf);
 } ngx_http_module_t;