From cc05432bf4e58ec53c64a5d11737608d1b44a2e8 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 2 Oct 2006 14:50:19 +0000 Subject: [PATCH] fix building on Linux and Solaris --- src/os/unix/ngx_files.c | 4 ++-- src/os/unix/ngx_files.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c index 12e595ee8..50db532b6 100644 --- a/src/os/unix/ngx_files.c +++ b/src/os/unix/ngx_files.c @@ -256,7 +256,7 @@ ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir) ngx_int_t ngx_open_glob(ngx_glob_t *gl) { - if (glob((char *) gl->pattern, 0, NULL, &gl->pglob) == 0) { + if (glob((char *) gl->pattern, GLOB_NOSORT, NULL, &gl->pglob) == 0) { return NGX_OK; } @@ -267,7 +267,7 @@ ngx_open_glob(ngx_glob_t *gl) ngx_int_t ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name) { - if (gl->n < gl->pglob.gl_pathc) { + if (gl->n < (size_t) gl->pglob.gl_pathc) { name->len = (size_t) ngx_strlen(gl->pglob.gl_pathv[gl->n]); name->data = (u_char *) gl->pglob.gl_pathv[gl->n]; diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h index 3e1e22519..72d3461a8 100644 --- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -131,7 +131,7 @@ ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir); typedef struct { - int n; + size_t n; glob_t pglob; u_char *pattern; ngx_log_t *log;