frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os/log: adjust gcc version conditions for #pragma 

In commit e67f2d7e0f ("gcc 4.2.1 doesn't
support #pragma GCC diagnostic ignored"), some compile time
conditionals were added around the #pragma usage. Those conditionals
ensure that the #pragma are not used on gcc <= 4.2.

However, the usage of #pragma diagnostic inside functions was only
added in gcc 4.6, and a build failure is therefore experienced with
gcc 4.5:

log.c: In function 'LogInit':
log.c:199:9: error: #pragma GCC diagnostic not allowed inside functions
log.c:201:9: warning: format not a string literal, argument types not checked
log.c:212:9: error: #pragma GCC diagnostic not allowed inside functions
log.c:214:17: warning: format not a string literal, argument types not checked

$ ./host/usr/bin/powerpc-linux-gnu-gcc -v
[...]
gcc version 4.5.2 (Sourcery G++ Lite 2011.03-38)

This patch therefore adjusts the compile time conditionals to make
sure the #pragma is not used on gcc <= 4.5, and only used on gcc >=
4.6.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by:  Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Thomas Petazzoni 2014-09-02 22:03:14 +02:00 committed by Keith Packard
parent da4bad620a
commit 7a0c79c8c4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/log.c
View File

@ -195,7 +195,7 @@ LogInit(const char *fname, const char *backup)
char *logFileName = NULL;
if (fname && *fname) {
#if __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2
#if __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 5
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
if (asprintf(&logFileName, fname, display) == -1)
@ -208,7 +208,7 @@ LogInit(const char *fname, const char *backup)
char *suffix;
char *oldLog;
#if __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2
#if __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 5
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
if ((asprintf(&suffix, backup, display) == -1) ||