Mesa (master): mapi: Don't rely on GNU void pointer arithmetic.

Matt Turner mattst88 at kemper.freedesktop.org
Sat Feb 28 00:57:27 UTC 2015


Module: Mesa
Branch: master
Commit: 76cd0f00f44c0935dc7d6a0e14e0515f08a8e1dc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=76cd0f00f44c0935dc7d6a0e14e0515f08a8e1dc

Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Feb 27 11:42:43 2015 -0800

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 <brianp at vmware.com>

---

 src/mapi/entry_x86-64_tls.h |    2 +-
 src/mapi/entry_x86_tls.h    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mapi/entry_x86-64_tls.h b/src/mapi/entry_x86-64_tls.h
index 71e9d60..d571df9 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 fa7bc15..df31dce 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));




More information about the mesa-commit mailing list