From daab61e40ca2656489acde8367ba916656b13cb1 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 24 Jun 2010 15:17:06 +0000 Subject: [PATCH] fix a bug when ngx_cpymem() returns a cast type: p = (type *) ngx_cpymem(...) --- src/core/ngx_string.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h index 86a960102..821871470 100644 --- a/src/core/ngx_string.h +++ b/src/core/ngx_string.h @@ -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); -#define ngx_cpymem(dst, src, n) ((u_char *) ngx_memcpy(dst, src, n)) + (n) +#define ngx_cpymem(dst, src, n) (((u_char *) ngx_memcpy(dst, src, n)) + (n)) #else @@ -99,7 +99,7 @@ void *ngx_memcpy(void *dst, void *src, size_t n); * icc8 compile memcpy(d, s, 4) to the inline "mov"es or XMM moves. */ #define ngx_memcpy(dst, src, n) (void) memcpy(dst, src, n) -#define ngx_cpymem(dst, src, n) ((u_char *) memcpy(dst, src, n)) + (n) +#define ngx_cpymem(dst, src, n) (((u_char *) memcpy(dst, src, n)) + (n)) #endif