From a204a38963ee6e5233876b00dd658c804e994940 Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 8 Jan 2016 11:21:23 +0100 Subject: Modified RBUFP to return a const void * Signed-off-by: Haru --- src/common/socket.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common/socket.h b/src/common/socket.h index b9e6f6f42..947ea8d3e 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -85,7 +85,12 @@ struct config_setting_t; #define WP2PTR(fd) WFIFO2PTR(fd) // buffer I/O macros -#define RBUFP(p,pos) (((const uint8 *)(p)) + (pos)) +static inline const void *RBUFP_(const void *p, int pos) __attribute__((const, unused)); +static inline const void *RBUFP_(const void *p, int pos) +{ + return ((const uint8 *)p) + pos; +} +#define RBUFP(p,pos) RBUFP_(p, (int)(pos)) #define RBUFB(p,pos) (*(const uint8 *)RBUFP((p),(pos))) #define RBUFW(p,pos) (*(const uint16 *)RBUFP((p),(pos))) #define RBUFL(p,pos) (*(const uint32 *)RBUFP((p),(pos))) -- cgit v1.2.3-60-g2f50