Re: nginx 1.1.8 не собирается clang на -CURRENT

[Igor Sysoev]

On Fri, Nov 18, 2011 at 04:02:01AM -0500, vsharun wrote:
> FreeBSD 10.0-CURRENT #2: Tue Nov  8 09:30:37 EET 2011
> 
> src/os/unix/ngx_files.c:470:1: error: expected parameter declarator
> ngx_read_ahead(ngx_fd_t fd, size_t n)
> ^
> src/os/unix/ngx_files.h:280:44: note: expanded from:
> #define ngx_read_ahead(fd, n)    fcntl(fd, F_READAHEAD, (int) n)
>                                            ^
> /usr/include/fcntl.h:226:21: note: expanded from:
> #define F_READAHEAD     15              /* read ahead */
>                         ^
> src/os/unix/ngx_files.c:470:1: error: expected ')'
> src/os/unix/ngx_files.c:470:1: note: to match this '('
> ngx_read_ahead(ngx_fd_t fd, size_t n)
> ^
> src/os/unix/ngx_files.h:280:39: note: expanded from:
> #define ngx_read_ahead(fd, n)    fcntl(fd, F_READAHEAD, (int) n)
>                                       ^
> src/os/unix/ngx_files.c:470:1: error: conflicting types for 'fcntl'
> ngx_read_ahead(ngx_fd_t fd, size_t n)
> ^
> src/os/unix/ngx_files.h:280:34: note: expanded from:
> #define ngx_read_ahead(fd, n)    fcntl(fd, F_READAHEAD, (int) n)
>                                  ^
> /usr/include/fcntl.h:296:5: note: previous declaration is here
> int     fcntl(int, int, ...);
>         ^
> 3 errors generated.
> *** Error code 1

Патч.


-- 
Igor Sysoev
-------------- next part --------------
Index: src/os/unix/ngx_files.c
===================================================================
--- src/os/unix/ngx_files.c	(revision 4286)
+++ src/os/unix/ngx_files.c	(working copy)
@@ -464,7 +464,7 @@
 }
 
 
-#if (NGX_HAVE_POSIX_FADVISE)
+#if (NGX_HAVE_POSIX_FADVISE) && !(NGX_HAVE_F_READAHEAD)
 
 ngx_int_t
 ngx_read_ahead(ngx_fd_t fd, size_t n)