summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Høgsberg <[email protected]>2010-07-28 10:13:44 -0400
committerKristian Høgsberg <[email protected]>2010-07-28 16:42:00 -0400
commit65d98e25770487456eb3d7eb8ec3ec8272f170b1 (patch)
treeedbd4a525dc8180d849187e7838975e67b738191
parent6ddf66e9230ee862ac341c4767cf6b3b2dd2552b (diff)
glx: Rename glcontextmodes.[ch] to glxconfig.[ch]
-rw-r--r--src/glx/Makefile2
-rw-r--r--src/glx/dri_common.c1
-rw-r--r--src/glx/glxclient.h2
-rw-r--r--src/glx/glxcmds.c1
-rw-r--r--src/glx/glxconfig.c (renamed from src/glx/glcontextmodes.c)4
-rw-r--r--src/glx/glxconfig.h (renamed from src/glx/glcontextmodes.h)0
-rw-r--r--src/glx/glxext.c1
7 files changed, 4 insertions, 7 deletions
diff --git a/src/glx/Makefile b/src/glx/Makefile
index 48d901fb894..70def7a2fbe 100644
--- a/src/glx/Makefile
+++ b/src/glx/Makefile
@@ -5,10 +5,10 @@ EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT \
-DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\"
SOURCES = \
- glcontextmodes.c \
clientattrib.c \
compsize.c \
eval.c \
+ glxconfig.c \
glxcmds.c \
glxcurrent.c \
glxext.c \
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index 7866521e420..812fb2eb080 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -39,7 +39,6 @@
#include <dlfcn.h>
#include <stdarg.h>
#include "glxclient.h"
-#include "glcontextmodes.h"
#include "dri_common.h"
#ifndef RTLD_NOW
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 3a8d294dab8..f8691433a69 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -51,7 +51,7 @@
#endif
#include "GL/glxproto.h"
#include "glapi/glapitable.h"
-#include "glcontextmodes.h"
+#include "glxconfig.h"
#include "glxhash.h"
#if defined( PTHREADS )
# include <pthread.h>
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 85bfa657e0d..55a736ce475 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -36,7 +36,6 @@
#include "glxclient.h"
#include "glapi.h"
#include "glxextensions.h"
-#include "glcontextmodes.h"
#ifdef GLX_DIRECT_RENDERING
#ifdef GLX_USE_APPLEGL
diff --git a/src/glx/glcontextmodes.c b/src/glx/glxconfig.c
index 186de485ff4..1d9678f48cd 100644
--- a/src/glx/glcontextmodes.c
+++ b/src/glx/glxconfig.c
@@ -23,7 +23,7 @@
*/
/**
- * \file glcontextmodes.c
+ * \file glxconfig.c
* Utility routines for working with \c struct glx_config structures. At
* some point most or all of these functions will be moved to the Mesa
* code base.
@@ -36,7 +36,7 @@
#include <stdlib.h>
#include <string.h>
-#include "glcontextmodes.h"
+#include "glxconfig.h"
#define NUM_VISUAL_TYPES 6
diff --git a/src/glx/glcontextmodes.h b/src/glx/glxconfig.h
index f7ee958e4be..f7ee958e4be 100644
--- a/src/glx/glcontextmodes.h
+++ b/src/glx/glxconfig.h
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 8e8b362d10d..b02755a6c2c 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -47,7 +47,6 @@
#include "apple_visual.h"
#endif
#include "glxextensions.h"
-#include "glcontextmodes.h"
#ifdef USE_XCB
#include <X11/Xlib-xcb.h>