From ea6cf2b68614e9f8d0db44ee917ce93f9ad1ac2f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 2 Jan 2013 17:02:58 -0800 Subject: mesa: Use quotes on bool driconf options to prevent stdbool.h breakage. Since stdbool.h's "true" and "false" are #defines, they got expanded when used as macro arguments, and that expanded value was stored in the XML string, producing XML that driconf would then fail to parse. Currently no drivers included stdbool along with driconf, but I keep accidentally doing so on intel as we move towards using normal C. v2: rebase on master. Reviewed-by: Kenneth Graunke (v1) --- src/mesa/drivers/dri/common/xmlpool.h | 7 ++++++ src/mesa/drivers/dri/common/xmlpool/t_options.h | 30 ++++++++++++------------- src/mesa/drivers/dri/intel/intel_screen.c | 28 +++++++++++------------ src/mesa/drivers/dri/radeon/radeon_screen.c | 16 ++++++------- 4 files changed, 44 insertions(+), 37 deletions(-) (limited to 'src/mesa/drivers/dri') diff --git a/src/mesa/drivers/dri/common/xmlpool.h b/src/mesa/drivers/dri/common/xmlpool.h index ffea430024d..ebd4e7c863a 100644 --- a/src/mesa/drivers/dri/common/xmlpool.h +++ b/src/mesa/drivers/dri/common/xmlpool.h @@ -60,6 +60,13 @@ #define DRI_CONF_OPT_BEGIN(name,type,def) \ "