mirror of
https://github.com/nginx/nginx.git
synced 2024-12-03 04:39:00 +08:00
Added "const" to ngx_memcpy() with NGX_MEMCPY_LIMIT defined.
This fixes warning produced during compilation of the ngx_http_geoip_module due to const qualifier being discarded.
This commit is contained in:
parent
beaed67996
commit
d053bacb9c
@ -1827,7 +1827,7 @@ ngx_sort(void *base, size_t n, size_t size,
|
||||
#if (NGX_MEMCPY_LIMIT)
|
||||
|
||||
void *
|
||||
ngx_memcpy(void *dst, void *src, size_t n)
|
||||
ngx_memcpy(void *dst, const void *src, size_t n)
|
||||
{
|
||||
if (n > NGX_MEMCPY_LIMIT) {
|
||||
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "memcpy %uz bytes", n);
|
||||
|
@ -89,7 +89,7 @@ ngx_strlchr(u_char *p, u_char *last, u_char c)
|
||||
|
||||
#if (NGX_MEMCPY_LIMIT)
|
||||
|
||||
void *ngx_memcpy(void *dst, void *src, size_t n);
|
||||
void *ngx_memcpy(void *dst, const void *src, size_t n);
|
||||
#define ngx_cpymem(dst, src, n) (((u_char *) ngx_memcpy(dst, src, n)) + (n))
|
||||
|
||||
#else
|
||||
|
Loading…
Reference in New Issue
Block a user