From 1487145b41390e689f8b03c1e8a2df70e00cf519 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 13 Dec 2013 11:25:45 -0800 Subject: [PATCH] Add 'FONT_PATH_NAME_ELEMENT_CONST' to dix-config.h and xorg-server.h This signals to the fontsproto code that the X server has been fixed to allow the name member in a FontPathElement struct to be declared const to eliminate piles of warnings when assigning string constants to them. Signed-off-by: Keith Packard Reviewed-by: Eric Anholt --- include/dix-config.h.in | 3 +++ include/xorg-server.h.in | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 957257b12..55cfe4710 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -472,4 +472,7 @@ /* Don't let Xdefs.h define 'pointer' */ #define _XTYPEDEF_POINTER 1 +/* Ask fontsproto to make font path element names const */ +#define FONT_PATH_ELEMENT_NAME_CONST 1 + #endif /* _DIX_CONFIG_H_ */ diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index 0c651bfab..8bf9d38f2 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -224,4 +224,7 @@ /* Use XTrans FD passing support */ #undef XTRANS_SEND_FDS +/* Ask fontsproto to make font path element names const */ +#define FONT_PATH_ELEMENT_NAME_CONST 1 + #endif /* _XORG_SERVER_H_ */