Mesa (7.10): apple: Rename glcontextmodes.[ch] to glxconfig.[ch]
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Mon Jun 6 16:13:27 UTC 2011
Module: Mesa
Branch: 7.10
Commit: 6ad7721500d9d6c74cc9018386ccb7f4fbd42600
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ad7721500d9d6c74cc9018386ccb7f4fbd42600
Author: Jeremy Huddleston <jeremyhu at 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 <jeremyhu at 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
More information about the mesa-commit
mailing list