Mercurial > hg > nginx

changeset 735:72621ebef255

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix building on Linux and Solaris
author Igor Sysoev <igor@sysoev.ru>
date Mon, 02 Oct 2006 14:50:19 +0000
parents d8615f90445e
children 40266f92b829
files src/os/unix/ngx_files.c src/os/unix/ngx_files.h
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/unix/ngx_files.c	Mon Oct 02 14:21:47 2006 +0000
+++ b/src/os/unix/ngx_files.c	Mon Oct 02 14:50:19 2006 +0000
@@ -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];
--- a/src/os/unix/ngx_files.h	Mon Oct 02 14:21:47 2006 +0000
+++ b/src/os/unix/ngx_files.h	Mon Oct 02 14:50:19 2006 +0000
@@ -131,7 +131,7 @@
 
 
 typedef struct {
-    int         n;
+    size_t      n;
     glob_t      pglob;
     u_char     *pattern;
     ngx_log_t  *log;