Mesa (master): egl: Fix -Wint-to-pointer-cast

Adam Jackson ajax at kemper.freedesktop.org
Mon May 8 17:10:26 UTC 2017


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

Author: Chad Versace <chadversary at chromium.org>
Date:   Fri May  5 12:27:03 2017 -0700

egl: Fix -Wint-to-pointer-cast

main/egldisplay.c: In function '_eglParseX11DisplayAttribList':
main/egldisplay.c:491:38: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
          display->Options.Platform = (void *)value;

The fix: cast to uinptr_t before void*.
                                      ^
Fixes: ddb99127 egl/x11: Honor the EGL_PLATFORM_X11_SCREEN_EXT attribute
Cc: Adam Jackson <ajax at redhat.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/egl/main/egldisplay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c
index c4b0fd6aab..6dda4e5e86 100644
--- a/src/egl/main/egldisplay.c
+++ b/src/egl/main/egldisplay.c
@@ -488,7 +488,7 @@ _eglParseX11DisplayAttribList(_EGLDisplay *display, const EGLint *attrib_list)
        * EGL_PLATFORM_X11_SCREEN_EXT, which is optional.
        */
       if (attrib == EGL_PLATFORM_X11_SCREEN_EXT) {
-         display->Options.Platform = (void *)value;
+         display->Options.Platform = (void *)(uintptr_t)value;
       } else {
          _eglError(EGL_BAD_ATTRIBUTE, "eglGetPlatformDisplay");
          return EGL_FALSE;




More information about the mesa-commit mailing list