Commit daab61e40ca2656489acde8367ba916656b13cb1 - nginx

fix a bug when ngx_cpymem() returns a cast type: p = (type *) ngx_cpymem(...) Igor Sysoev 12 years ago

1 changed file(s) with 2 addition(s) and 2 deletion(s). Raw diff Collapse all Expand all

-2

src/core/ngx_string.h less more

88	88	#if (NGX_MEMCPY_LIMIT)
89	89
90	90	void ngx_memcpy(void dst, void *src, size_t n);
91		#define ngx_cpymem(dst, src, n) ((u_char *) ngx_memcpy(dst, src, n)) + (n)
	91	#define ngx_cpymem(dst, src, n) (((u_char *) ngx_memcpy(dst, src, n)) + (n))
92	92
93	93	#else
94	94

98	98	* icc8 compile memcpy(d, s, 4) to the inline "mov"es or XMM moves.
99	99	*/
100	100	#define ngx_memcpy(dst, src, n) (void) memcpy(dst, src, n)
101		#define ngx_cpymem(dst, src, n) ((u_char *) memcpy(dst, src, n)) + (n)
	101	#define ngx_cpymem(dst, src, n) (((u_char *) memcpy(dst, src, n)) + (n))
102	102
103	103	#endif
104	104