Mercurial > hg > nginx-vendor-current
annotate src/os/unix/ngx_alloc.h @ 684:660139fd80ca NGINX_1_3_5
nginx 1.3.5
*) Change: the ngx_http_mp4_module module no longer skips tracks in
formats other than H.264 and AAC.
*) Bugfix: a segmentation fault might occur in a worker process if the
"map" directive was used with variables as values.
*) Bugfix: a segmentation fault might occur in a worker process if the
"geo" directive was used with the "ranges" parameter but without the
"default" parameter; the bug had appeared in 0.8.43.
Thanks to Zhen Chen and Weibin Yao.
*) Bugfix: in the -p command-line parameter handling.
*) Bugfix: in the mail proxy server.
*) Bugfix: of minor potential bugs.
Thanks to Coverity.
*) Bugfix: nginx/Windows could not be built with Visual Studio 2005
Express.
Thanks to HAYASHI Kentaro.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 21 Aug 2012 00:00:00 +0400 |
parents | d0f7a625f27c |
children |
rev | line source |
---|---|
0 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
660 | 4 * Copyright (C) Nginx, Inc. |
0 | 5 */ |
6 | |
7 | |
8 #ifndef _NGX_ALLOC_H_INCLUDED_ | |
9 #define _NGX_ALLOC_H_INCLUDED_ | |
10 | |
11 | |
12 #include <ngx_config.h> | |
13 #include <ngx_core.h> | |
14 | |
15 | |
16 void *ngx_alloc(size_t size, ngx_log_t *log); | |
17 void *ngx_calloc(size_t size, ngx_log_t *log); | |
18 | |
19 #define ngx_free free | |
20 | |
21 | |
22 /* | |
23 * Linux has memalign() or posix_memalign() | |
24 * Solaris has memalign() | |
390 | 25 * FreeBSD 7.0 has posix_memalign(), besides, early version's malloc() |
26 * aligns allocations bigger than page size at the page boundary | |
0 | 27 */ |
28 | |
18 | 29 #if (NGX_HAVE_POSIX_MEMALIGN || NGX_HAVE_MEMALIGN) |
0 | 30 |
31 void *ngx_memalign(size_t alignment, size_t size, ngx_log_t *log); | |
32 | |
33 #else | |
34 | |
35 #define ngx_memalign(alignment, size, log) ngx_alloc(size, log) | |
36 | |
37 #endif | |
38 | |
39 | |
258 | 40 extern ngx_uint_t ngx_pagesize; |
41 extern ngx_uint_t ngx_pagesize_shift; | |
138 | 42 extern ngx_uint_t ngx_cacheline_size; |
0 | 43 |
44 | |
45 #endif /* _NGX_ALLOC_H_INCLUDED_ */ |