summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-08-17 18:35:20 -0700
committerKeith Packard <keithp@keithp.com>2015-08-17 18:50:00 -0700
commit5daf1295cb4f71510da595721d10f7ea3b74d1b9 (patch)
treeb6a33be9e57f21a7850d6287a886ac6ec306ee56
parentd4710004367ab8eab794a12385ca7ed3acc9a0e0 (diff)
dixfont.h: Include fontutil.h before GetGlyphs is #defined
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@keithp.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--include/dixfont.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/dixfont.h b/include/dixfont.h
index 1895509b3..b44996ffa 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)