commit cc05432bf4e58ec53c64a5d11737608d1b44a2e8
author Igor Sysoev <igor@sysoev.ru> Mon Oct 02 14:50:19 2006 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Oct 02 14:50:19 2006 +0000
tree f58dd20b1c49c79f0cb32bb4644fa86e11012f32
parent 0e4a95dfe398c4e7ce86e5b0698d59ac281591b0

fix building on Linux and Solaris

src/os/unix/ngx_files.c

diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 12e595e..50db532 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -256,7 +256,7 @@
 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_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];

src/os/unix/ngx_files.h

diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index 3e1e225..72d3461 100644
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -131,7 +131,7 @@
 
 
 typedef struct {
-    int         n;
+    size_t      n;
     glob_t      pglob;
     u_char     *pattern;
     ngx_log_t  *log;