aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/test
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-08-30 15:35:17 +0200
committermarha <marha@users.sourceforge.net>2013-08-30 15:35:17 +0200
commit5ebbc3a366287b631775ed3e17537580d380db8a (patch)
treef43c3d54e7c0e161c83288d83b22cbd7da49cc96 /xorg-server/test
parent84e570d071a041f85e2e8b92963d3390d14af5fc (diff)
downloadvcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.tar.gz
vcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.tar.bz2
vcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.zip
fontconfig mesa xserver xkeyboard-config xkbcomp git update 30 aug 2013
xserver commit 94d4e29aedc69431fa9b299ca1b67947173d7a24 xkeyboard-config commit fcb91cb1013cbdd87a6f77533f188d5934f24046 xkbcomp commit 24d18e0a844041ef82441adb16aa18cc4b4814ae fontconfig commit 071ce44c35733e54cb477cc75810cbe55025b619 mesa commit f7217b99f243738f941a5d009c68387dfadcb50a
Diffstat (limited to 'xorg-server/test')
-rw-r--r--xorg-server/test/signal-logging.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/test/signal-logging.c b/xorg-server/test/signal-logging.c
index f6bc85ce8..a03c5acbe 100644
--- a/xorg-server/test/signal-logging.c
+++ b/xorg-server/test/signal-logging.c
@@ -150,6 +150,7 @@ number_formatting(void)
assert(check_float_format_test(float_tests[i]));
}
+#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-security"
static void logging_format(void)
{
@@ -378,7 +379,7 @@ static void logging_format(void)
#undef read_log_msg
}
-#pragma GCC diagnostic pop "-Wformat-security"
+#pragma GCC diagnostic pop /* "-Wformat-security" */
int
main(int argc, char **argv)