From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 26 Aug 2008 17:15:11 +0000 (+0000)
Subject: fix build on Linux and Solaris introduced in r2200
X-Git-Tag: release-0.7.13~1
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=316eafb88d67c2fa7173b5d3986446a403184eb3;p=nginx.git

fix build on Linux and Solaris introduced in r2200
---

diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index d3abdd9e2..8d2733821 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -280,7 +280,15 @@ ngx_open_glob(ngx_glob_t *gl)
 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];