From 76cd0f00f44c0935dc7d6a0e14e0515f08a8e1dc Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 27 Feb 2015 11:42:43 -0800 Subject: mapi: Don't rely on GNU void pointer arithmetic. Commit 79daa510c added -Werror=pointer-arith to CFLAGS, which makes arithmetic on void pointers an error. See https://gcc.gnu.org/onlinedocs/gcc/Pointer-Arith.html Reviewed-by: Brian Paul --- src/mapi/entry_x86-64_tls.h | 2 +- src/mapi/entry_x86_tls.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mapi') diff --git a/src/mapi/entry_x86-64_tls.h b/src/mapi/entry_x86-64_tls.h index 71e9d606305..d571df97433 100644 --- a/src/mapi/entry_x86-64_tls.h +++ b/src/mapi/entry_x86-64_tls.h @@ -88,7 +88,7 @@ entry_generate(int slot) 0x41, 0xff, 0xa3, 0x34, 0x12, 0x00, 0x00, }; unsigned long addr; - void *code; + char *code; mapi_func entry; addr = x86_64_current_tls(); diff --git a/src/mapi/entry_x86_tls.h b/src/mapi/entry_x86_tls.h index fa7bc15b890..df31dce55f1 100644 --- a/src/mapi/entry_x86_tls.h +++ b/src/mapi/entry_x86_tls.h @@ -113,7 +113,7 @@ entry_generate(int slot) 0xff, 0xa0, 0x34, 0x12, 0x00, 0x00, /* jmp *0x1234(%eax) */ 0x90, 0x90, 0x90, 0x90 /* nop's */ }; - void *code; + char *code; mapi_func entry; code = u_execmem_alloc(sizeof(code_templ)); -- cgit v1.2.3