[PATCH 2/2] Add 'FONT_PATH_NAME_ELEMENT_CONST' to dix-config.h and xorg-server.h

Keith Packard keithp at keithp.com
Fri Dec 13 11:29:51 PST 2013


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 <keithp at keithp.com>
---
 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 3066100..6371a53 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -469,4 +469,7 @@
 /* Directory for shared memory temp files */
 #undef SHMDIR
 
+/* 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 0c651bf..8bf9d38 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_ */
-- 
1.8.4.4



More information about the xorg-devel mailing list