Mesa (master): apple: Store the CGL API version number for future reference

[Jeremy Huddleston]

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

Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sat Jun 11 23:43:03 2011 -0700

apple: Store the CGL API version number for future reference

Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

---

 src/glx/apple/apple_cgl.c |    7 +++----
 src/glx/apple/apple_cgl.h |    3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/glx/apple/apple_cgl.c b/src/glx/apple/apple_cgl.c
index 737d757..648ed86 100644
--- a/src/glx/apple/apple_cgl.c
+++ b/src/glx/apple/apple_cgl.c
@@ -64,7 +64,6 @@ void
 apple_cgl_init(void)
 {
    void *h;
-   GLint major = 0, minor = 0;
    const char *opengl_framework_path;
 
    if (initialized)
@@ -88,11 +87,11 @@ apple_cgl_init(void)
 
    apple_cgl.get_version = sym(h, "CGLGetVersion");
 
-   apple_cgl.get_version(&major, &minor);
+   apple_cgl.get_version(&apple_cgl.version_major, &apple_cgl.version_minor);
 
-   apple_glx_diagnostic("CGL major %d minor %d\n", major, minor);
+   apple_glx_diagnostic("CGL major %d minor %d\n", apple_cgl.version_major, apple_cgl.version_minor);
 
-   if (1 != major) {
+   if (1 != apple_cgl.version_major) {
       fprintf(stderr, "WARNING: the CGL major version has changed!\n"
               "libGL may be incompatible!\n");
    }
diff --git a/src/glx/apple/apple_cgl.h b/src/glx/apple/apple_cgl.h
index 5e98a00..002c7e6 100644
--- a/src/glx/apple/apple_cgl.h
+++ b/src/glx/apple/apple_cgl.h
@@ -40,7 +40,8 @@
 
 struct apple_cgl_api
 {
-   void (*get_version) (GLint * majorvers, GLint * minorvers);
+     GLint version_major, version_minor;
+     void (*get_version) (GLint * version_major, GLint * version_minor);
 
      CGLError(*choose_pixel_format) (const CGLPixelFormatAttribute * attribs,
                                      CGLPixelFormatObj * pix, GLint * npix);