[PATCH 1/2] dixfont.h: Include fontutil.h before GetGlyphs is #defined
Keith Packard
keithp at keithp.com
Mon Aug 17 18:39:56 PDT 2015
This eliminates the duplicate declaration of dixGetGlyphs when
fontutil.h gets included after dixfont.h has defined GetGlyphs as
dixGetGlyphs.
Signed-off-by: Keith Packard <keithp at keithp.com>
---
include/dixfont.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/dixfont.h b/include/dixfont.h
index 1895509..b44996f 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -29,6 +29,7 @@ SOFTWARE.
#include "closure.h"
#include <X11/fonts/fontstruct.h>
#include <X11/fonts/fontproto.h>
+#include <X11/fonts/fontutil.h>
#define NullDIXFontProp ((DIXFontPropPtr)0)
--
2.5.0
More information about the xorg-devel
mailing list