diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-30 15:40:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-30 15:40:11 +0200 |
| commit | 22bc825e9931f718cc0564aa55915961abaffce4 (patch) | |
| tree | f53ea31eb5368d3f60860d3e8911fa83a7fd851a /xorg-server/test | |
| parent | ac46cfda36d6dbe8d5c092124a66ffe3f2bad15f (diff) | |
| parent | 5ebbc3a366287b631775ed3e17537580d380db8a (diff) | |
| download | vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.tar.gz vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.tar.bz2 vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver xkeyboard-config xkbcomp git update 30 aug 2013
Diffstat (limited to 'xorg-server/test')
| -rw-r--r-- | xorg-server/test/signal-logging.c | 3 |
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) |