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>

diff --git a/src/glx/Makefile b/src/glx/Makefile
index dd96973..183ffb1 100644 (file)
--- 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 6868d28..66e6658 100644 (file)
--- 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
similarity index 100%
rename from src/glx/apple/glx_error.c
rename to src/glx/glx_error.c

diff --git a/src/glx/apple/glx_error.h b/src/glx/glx_error.h
similarity index 100%
rename from src/glx/apple/glx_error.h
rename to src/glx/glx_error.h