4 files changed, 7 insertions, 4 deletions
diff --git a/third_party/mesa/MesaLib/src/egl/main/eglapi.c b/third_party/mesa/MesaLib/src/egl/main/eglapi.c
index 829d700..bfedf405 100644
--- a/third_party/mesa/MesaLib/src/egl/main/eglapi.c
+++ b/third_party/mesa/MesaLib/src/egl/main/eglapi.c
@@ -273,7 +273,7 @@ EGLDisplay EGLAPIENTRY
 eglGetDisplay(EGLNativeDisplayType nativeDisplay)
 {
    _EGLPlatformType plat = _eglGetNativePlatform();
-   _EGLDisplay *dpy = _eglFindDisplay(plat, (void *) nativeDisplay);
+   _EGLDisplay *dpy = _eglFindDisplay(plat, nativeDisplay);
    return _eglGetDisplayHandle(dpy);
 }
 
diff --git a/third_party/mesa/MesaLib/src/egl/main/egldisplay.c b/third_party/mesa/MesaLib/src/egl/main/egldisplay.c
index cc0f03e..df35569 100644
--- a/third_party/mesa/MesaLib/src/egl/main/egldisplay.c
+++ b/third_party/mesa/MesaLib/src/egl/main/egldisplay.c
@@ -105,7 +105,7 @@ _eglFiniDisplay(void)
  * new one.
  */
 _EGLDisplay *
-_eglFindDisplay(_EGLPlatformType plat, void *plat_dpy)
+_eglFindDisplay(_EGLPlatformType plat, EGLNativeDisplayType plat_dpy)
 {
    _EGLDisplay *dpy;
 
diff --git a/third_party/mesa/MesaLib/src/egl/main/egldisplay.h b/third_party/mesa/MesaLib/src/egl/main/egldisplay.h
index 3863cce..bb8c376 100644
--- a/third_party/mesa/MesaLib/src/egl/main/egldisplay.h
+++ b/third_party/mesa/MesaLib/src/egl/main/egldisplay.h
@@ -86,7 +86,7 @@ struct _egl_display
    _EGLMutex Mutex;
 
    _EGLPlatformType Platform;
-   void *PlatformDisplay;
+   EGLNativeDisplayType PlatformDisplay;
 
    EGLBoolean Initialized; /**< True if the display is initialized */
    _EGLDriver *Driver;
@@ -118,7 +118,7 @@ _eglFiniDisplay(void);
 
 
 extern _EGLDisplay *
-_eglFindDisplay(_EGLPlatformType plat, void *plat_dpy);
+_eglFindDisplay(_EGLPlatformType plat, EGLNativeDisplayType plat_dpy);
 
 
 PUBLIC void
diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium
index 4f51b87..c19eb9b 100644
--- a/third_party/mesa/README.chromium
+++ b/third_party/mesa/README.chromium
@@ -75,3 +75,6 @@ Later modifications (see chromium.patch):
   so that it can be compiled against standard EGL 1.4 headers.
   
 - Initialized uninitialized mask variable in eglconfig.c line 245.
+
+- Fixed compiler warning about cast to pointer from integer of different size
+  in eglapi.c line 276. Replaced void* with EGLNativeDisplayType.