Module: Mesa Branch: 7.9 Commit: ff7e6622fcdd30d505104375e7d271969ac3b88f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff7e6622fcdd30d505104375e7d271969ac3b88f
Author: Jeremy Huddleston <jerem...@apple.com> Date: Sun Jun 5 16:56:01 2011 -0400 apple: Rename glcontextmodes.[ch] to glxconfig.[ch] Fixes regression introduced by: 65d98e25770487456eb3d7eb8ec3ec8272f170b1 Signed-off-by: Jeremy Huddleston <jerem...@apple.com> (cherry picked from commit 4c9bab78a118953baf307e31cd53e731299f0151) --- src/glx/apple/Makefile | 2 +- src/glx/apple/apple_glx_pbuffer.c | 2 +- src/glx/apple/apple_glx_pixmap.c | 2 +- src/glx/apple/apple_visual.c | 2 +- src/glx/apple/glx_empty.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile index fd47b3d..757e811 100644 --- a/src/glx/apple/Makefile +++ b/src/glx/apple/Makefile @@ -38,7 +38,7 @@ SOURCES = \ appledri.c \ ../clientattrib.c \ ../compsize.c \ - ../glcontextmodes.c \ + ../glxconfig.c \ glx_empty.c \ glx_error.c \ ../glx_pbuffer.c \ diff --git a/src/glx/apple/apple_glx_pbuffer.c b/src/glx/apple/apple_glx_pbuffer.c index a5ef59c..d79125d 100644 --- a/src/glx/apple/apple_glx_pbuffer.c +++ b/src/glx/apple/apple_glx_pbuffer.c @@ -44,7 +44,7 @@ #include <pthread.h> #include <assert.h> #include "apple_glx.h" -#include "glcontextmodes.h" +#include "glxconfig.h" #include "apple_cgl.h" /* mesa defines in glew.h, Apple in glext.h. diff --git a/src/glx/apple/apple_glx_pixmap.c b/src/glx/apple/apple_glx_pixmap.c index fec05e0..4586707 100644 --- a/src/glx/apple/apple_glx_pixmap.c +++ b/src/glx/apple/apple_glx_pixmap.c @@ -40,7 +40,7 @@ #include "apple_visual.h" #include "apple_glx_drawable.h" #include "appledri.h" -#include "glcontextmodes.h" +#include "glxconfig.h" static bool pixmap_make_current(struct apple_glx_context *ac, struct apple_glx_drawable *d); diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c index 7a9525e..29c6f16 100644 --- a/src/glx/apple/apple_visual.c +++ b/src/glx/apple/apple_visual.c @@ -47,7 +47,7 @@ #include "apple_cgl.h" #include "apple_visual.h" #include "apple_glx.h" -#include "glcontextmodes.h" +#include "glxconfig.h" enum { diff --git a/src/glx/apple/glx_empty.c b/src/glx/apple/glx_empty.c index 5967eca..1e9593c 100644 --- a/src/glx/apple/glx_empty.c +++ b/src/glx/apple/glx_empty.c @@ -1,6 +1,6 @@ #include "glxclient.h" #include "glxextensions.h" -#include "glcontextmodes.h" +#include "glxconfig.h" /* ** GLX_SGI_swap_control _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit