| Andrew Geissler | bffdb3e | 2020-08-21 16:13:29 -0500 | [diff] [blame^] | 1 | From cebbeaa9d0bdc18377faef27ea9ffd38e509d180 Mon Sep 17 00:00:00 2001 |
| 2 | From: Adam Jackson <ajax@redhat.com> |
| 3 | Date: Tue, 4 Feb 2020 16:38:06 -0500 |
| 4 | Subject: [PATCH] Fix link failure with gcc 10 |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Without the 'extern' this looks like a definition not just a |
| 10 | declaration, in every file that includes the header. gcc 10 is stricter |
| 11 | about this kind of multiple definition. |
| 12 | |
| 13 | Upstream-Status: Backport [https://cgit.freedesktop.org/xorg/driver/xf86-video-ati/commit/?id=f223035f4ffcff2a9296d1e907a5193f8e8845a3] |
| 14 | Reviewed-by: Michel Dรคnzer <mdaenzer@redhat.com> |
| 15 | --- |
| 16 | src/drmmode_display.h | 2 +- |
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/src/drmmode_display.h b/src/drmmode_display.h |
| 20 | index 96eaef0..8cd8a0a 100644 |
| 21 | --- a/src/drmmode_display.h |
| 22 | +++ b/src/drmmode_display.h |
| 23 | @@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type, |
| 24 | uint64_t *ust, uint32_t *result_seq); |
| 25 | |
| 26 | |
| 27 | -miPointerSpriteFuncRec drmmode_sprite_funcs; |
| 28 | +extern miPointerSpriteFuncRec drmmode_sprite_funcs; |
| 29 | |
| 30 | |
| 31 | #endif |
| 32 | -- |
| 33 | 2.28.0 |
| 34 | |