[PATCH xf86-video-amdgpu 02/13] Move xorg_list backwards compatibility to new amdgpu_list.h header

[Michel Dänzer]

From: Michel Dänzer <michel.daenzer at amd.com>

(Cherry picked from radeon commits 7c3470f4b659206ed23f761948936ede3a2dba3d
and 4a98f60117c387a228d5cbaadb6e298fb4e865df)

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 src/Makefile.am   |  1 +
 src/amdgpu_dri2.c |  9 +--------
 src/amdgpu_list.h | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 src/amdgpu_list.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 8715eb3..3fe1cd0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,6 +59,7 @@ EXTRA_DIST = \
 	amdgpu_bo_helper.h \
 	amdgpu_glamor.h \
 	amdgpu_drv.h \
+	amdgpu_list.h \
 	amdgpu_probe.h \
 	amdgpu_version.h \
 	amdgpu_video.h \
diff --git a/src/amdgpu_dri2.c b/src/amdgpu_dri2.c
index 32f6171..f05b742 100644
--- a/src/amdgpu_dri2.c
+++ b/src/amdgpu_dri2.c
@@ -47,14 +47,7 @@
 
 #include "amdgpu_version.h"
 
-#include "list.h"
-#if !HAVE_XORG_LIST
-#define xorg_list			list
-#define xorg_list_init			list_init
-#define xorg_list_add			list_add
-#define xorg_list_del			list_del
-#define xorg_list_for_each_entry	list_for_each_entry
-#endif
+#include "amdgpu_list.h"
 
 #if DRI2INFOREC_VERSION >= 9
 #define USE_DRI2_PRIME
diff --git a/src/amdgpu_list.h b/src/amdgpu_list.h
new file mode 100644
index 0000000..c1e3516
--- /dev/null
+++ b/src/amdgpu_list.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2015 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef _AMDGPU_LIST_H_
+#define _AMDGPU_LIST_H_
+
+#include <xorg-server.h>
+#include <list.h>
+
+#if !HAVE_XORG_LIST
+#define xorg_list			list
+#define xorg_list_init			list_init
+#define xorg_list_add			list_add
+#define xorg_list_del			list_del
+#define xorg_list_for_each_entry	list_for_each_entry
+#define xorg_list_for_each_entry_safe	list_for_each_entry_safe
+#endif
+
+#endif /* _AMDGPU_LIST_H_ */
-- 
2.1.4