[Intel-gfx] [PATCH xf86-video-intel 03/21] sna: undef FontSetPrivate() before redefining it

Ville Syrjala ville.syrjala at linux.intel.com
Thu Sep 19 16:30:55 UTC 2019


From: Ville Syrjälä <ville.syrjala at linux.intel.com>

Avoid the compiler gettings upset about us redefining
FontSetPrivate().

Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 src/sna/sna_accel.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 7fd00b9af679..934c8f662bea 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -121,6 +121,7 @@
 
 #if XFONT2_CLIENT_FUNCS_VERSION >= 1
 #define AllocateFontPrivateIndex() xfont2_allocate_font_private_index()
+#undef FontSetPrivate
 #define FontSetPrivate(font, idx, data) xfont2_font_set_private(font, idx, data)
 #endif
 
-- 
2.21.0



More information about the Intel-gfx mailing list