From dd46f0926d290f1f4ee50803621f6a4cdf7829a6 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Wed, 20 Aug 2014 19:29:42 +0100
Subject: [PATCH] include: move sarea.h next to it's only user
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The header is used by DRI1 drivers, which we've removed a while
back. Now only the dri1 loader in libGL is using it, so let's
move it in src/glx, and prefix it accordingly.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---
 src/glx/dri_glx.c                                  | 2 +-
 include/GL/internal/sarea.h => src/glx/dri_sarea.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename include/GL/internal/sarea.h => src/glx/dri_sarea.h (99%)

diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c
index 5295331769a..d0877519308 100644
--- a/src/glx/dri_glx.c
+++ b/src/glx/dri_glx.c
@@ -40,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "glxclient.h"
 #include "xf86dri.h"
 #include "dri2.h"
-#include "sarea.h"
+#include "dri_sarea.h"
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/include/GL/internal/sarea.h b/src/glx/dri_sarea.h
similarity index 99%
rename from include/GL/internal/sarea.h
rename to src/glx/dri_sarea.h
index c3b8bca2b69..fe4529b5412 100644
--- a/include/GL/internal/sarea.h
+++ b/src/glx/dri_sarea.h
@@ -1,5 +1,5 @@
 /**
- * \file sarea.h 
+ * \file dri_sarea.h
  * SAREA definitions.
  * 
  * \author Kevin E. Martin <kevin@precisioninsight.com>
-- 
2.30.2