summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2011-12-07 16:12:21 -0800
committerIan Romanick <ian.d.romanick@intel.com>2011-12-19 14:55:31 -0800
commit6f76efa9224f6a1cbe35f419172549abafdd751e (patch)
tree3f99deb75e0888cc499b005adea77d89ceabfe29
parent4dbd13cb3f5aeff6ddc85fd091b4677369c19778 (diff)
glx: Make __glXSendError available in non-Apple builds
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Eric Anholt <eric@anholt.net> Cc: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/glx/Makefile1
-rw-r--r--src/glx/apple/Makefile2
-rw-r--r--src/glx/glx_error.c (renamed from src/glx/apple/glx_error.c)0
-rw-r--r--src/glx/glx_error.h (renamed from src/glx/apple/glx_error.h)0
4 files changed, 2 insertions, 1 deletions
diff --git a/src/glx/Makefile b/src/glx/Makefile
index dd96973ea8..183ffb188a 100644
--- a/src/glx/Makefile
+++ b/src/glx/Makefile
@@ -15,6 +15,7 @@ SOURCES = \
glxconfig.c \
glxcmds.c \
glxcurrent.c \
+ glx_error.c \
glxext.c \
glxextensions.c \
indirect_glx.c \
diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile
index 6868d28451..66e665849a 100644
--- a/src/glx/apple/Makefile
+++ b/src/glx/apple/Makefile
@@ -39,7 +39,7 @@ SOURCES = \
../compsize.c \
../glxconfig.c \
glx_empty.c \
- glx_error.c \
+ ../glx_error.c \
../glx_pbuffer.c \
../glx_query.c \
../glxcmds.c \
diff --git a/src/glx/apple/glx_error.c b/src/glx/glx_error.c
index d44a80ca65..d44a80ca65 100644
--- a/src/glx/apple/glx_error.c
+++ b/src/glx/glx_error.c
diff --git a/src/glx/apple/glx_error.h b/src/glx/glx_error.h
index 6ba2f854db..6ba2f854db 100644
--- a/src/glx/apple/glx_error.h
+++ b/src/glx/glx_error.h