Mercurial > hg > nginx-quic

comparison src/core/ngx_file.h @ 1381:d59617e7e6a1 stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r1292, r1296 merge: proxy_store and fastcgi_store, proxy_store_access and fastcgi_store_access
author Igor Sysoev <igor@sysoev.ru>
date Sat, 11 Aug 2007 10:11:33 +0000
parents 4d203f76b757
children e958b3cab51a
comparison
equal deleted inserted replaced
1360:e06ffbeccf71 1381:d59617e7e6a1
93 93
94 void ngx_init_temp_number(void); 94 void ngx_init_temp_number(void);
95 ngx_atomic_uint_t ngx_next_temp_number(ngx_uint_t collision); 95 ngx_atomic_uint_t ngx_next_temp_number(ngx_uint_t collision);
96 96
97 char *ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 97 char *ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
98 char *ngx_conf_set_access_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
98 99
99 100
100 #define ngx_conf_merge_path_value(curr, prev, path, l1, l2, l3, clean, cf) \ 101 #define ngx_conf_merge_path_value(curr, prev, path, l1, l2, l3, clean, cf) \
101 if (curr == NULL) { \ 102 if (curr == NULL) { \
102 if (prev == NULL) { \ 103 if (prev == NULL) { \