commit 316eafb88d67c2fa7173b5d3986446a403184eb3
author Igor Sysoev <igor@sysoev.ru> Tue Aug 26 17:15:11 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Aug 26 17:15:11 2008 +0000
tree ebf84565a35d3cb0513e28ec31a63e3d2d73fcd1
parent e56cc8e5030bb74639c2b53a9c6c765dea6859f4

fix build on Linux and Solaris introduced in r2200

src/os/unix/ngx_files.c

diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index d3abdd9..8d27338 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -280,7 +280,15 @@
 ngx_int_t
 ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
 {
-    if (gl->n < (size_t) gl->pglob.gl_matchc) {
+    size_t  count;
+
+#ifdef GLOB_NOMATCH
+    count = (size_t) gl->pglob.gl_pathc;
+#else
+    count = (size_t) gl->pglob.gl_matchc;
+#endif
+
+    if (gl->n < count) {
 
         name->len = (size_t) ngx_strlen(gl->pglob.gl_pathv[gl->n]);
         name->data = (u_char *) gl->pglob.gl_pathv[gl->n];