diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2015-03-06 18:51:29 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2015-03-17 10:59:38 +0900 |
| commit | 7c3470f4b659206ed23f761948936ede3a2dba3d (patch) | |
| tree | 17800f9d7b0174e04d712ca2493b42730cd05c08 | |
| parent | 7388d0b6c54b9d536fdb161e3aa61b326627b939 (diff) | |
Move xorg_list backwards compatibility to new radeon_list.h header
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/radeon_dri2.c | 10 | ||||
| -rw-r--r-- | src/radeon_list.h | 38 |
3 files changed, 40 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9ff1ffba..708f2adb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -93,6 +93,7 @@ EXTRA_DIST = \ radeon_exa_shared.h \ radeon_glamor.h \ radeon.h \ + radeon_list.h \ radeon_probe.h \ radeon_reg.h \ radeon_version.h \ diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c index 8cc7e56b..36ab4d03 100644 --- a/src/radeon_dri2.c +++ b/src/radeon_dri2.c @@ -41,15 +41,7 @@ #include <errno.h> #include "radeon_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 "radeon_list.h" #include "radeon_bo_gem.h" diff --git a/src/radeon_list.h b/src/radeon_list.h new file mode 100644 index 00000000..40020136 --- /dev/null +++ b/src/radeon_list.h @@ -0,0 +1,38 @@ +/* + * 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 _RADEON_LIST_H_ +#define _RADEON_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 +#endif + +#endif /* _RADEON_LIST_H_ */ |