Mesa (7.9): apple: Rename __GLcontextModes to struct glx_config

Jeremy Huddleston jeremyhu at kemper.freedesktop.org
Tue Jun 14 06:22:47 UTC 2011


Module: Mesa
Branch: 7.9
Commit: 14b9e91d01c41fdc85a061ab76ae3479e5561176
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=14b9e91d01c41fdc85a061ab76ae3479e5561176

Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Jun  5 17:02:33 2011 -0400

apple: Rename __GLcontextModes to struct glx_config

Fixes regression introduced by: 6ddf66e9230ee862ac341c4767cf6b3b2dd2552b

Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
(cherry picked from commit bb621cb61e0c6d7fcd06df5a77c75efe5c76926d)

---

 src/glx/apple/apple_glx_pbuffer.c |    2 +-
 src/glx/glx_pbuffer.c             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glx/apple/apple_glx_pbuffer.c b/src/glx/apple/apple_glx_pbuffer.c
index d79125d..2817cda 100644
--- a/src/glx/apple/apple_glx_pbuffer.c
+++ b/src/glx/apple/apple_glx_pbuffer.c
@@ -128,7 +128,7 @@ apple_glx_pbuffer_create(Display * dpy, GLXFBConfig config,
    Window root;
    int screen;
    Pixmap xid;
-   struct glx_config *modes = (__GLcontextModes *) config;
+   struct glx_config *modes = (struct glx_config *) config;
 
    root = DefaultRootWindow(dpy);
    screen = DefaultScreen(dpy);
diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c
index 5f91bc6..55f570a 100644
--- a/src/glx/glx_pbuffer.c
+++ b/src/glx/glx_pbuffer.c
@@ -843,7 +843,7 @@ glXCreatePixmap(Display * dpy, GLXFBConfig config, Pixmap pixmap,
    WARN_ONCE_GLX_1_3(dpy, __func__);
 
 #ifdef GLX_USE_APPLEGL
-   const struct glx_config *modes = (const __GLcontextModes *) config;
+   const struct glx_config *modes = (const struct glx_config *) config;
 
    if (apple_glx_pixmap_create(dpy, modes->screen, pixmap, modes))
       return None;




More information about the mesa-commit mailing list