Commit 04130cc973a96df33b1429024fd6dec59fa35a84
Committed by
Michal Marek
Michal Marek
1 parent
bd70134396
Exists in
master
and in
20 other branches
Fix a build warning in scripts/mod/file2alias.c
On some systems, __used is already defined in sys/cdefs.h and causes
a build warning:
scripts/mod/file2alias.c:85:1: warning: "__used" redefined
In file included from /usr/include/stdio.h:64,
from scripts/mod/modpost.h:1,
from scripts/mod/file2alias.c:13:
/usr/include/sys/cdefs.h:146:1: warning: this is the location of the previous definition
This adds an extra check before defining the __used macro to see if
the macro was already defined elsewhere.
Signed-off-by: Daniel Tang <dt.tangr@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Showing 1 changed file with 6 additions and 4 deletions Side-by-side Diff
scripts/mod/file2alias.c
| ... | ... | @@ -79,10 +79,12 @@ |
| 79 | 79 | extern struct devtable *__start___devtable[], *__stop___devtable[]; |
| 80 | 80 | #endif /* __MACH__ */ |
| 81 | 81 | |
| 82 | -#if __GNUC__ == 3 && __GNUC_MINOR__ < 3 | |
| 83 | -# define __used __attribute__((__unused__)) | |
| 84 | -#else | |
| 85 | -# define __used __attribute__((__used__)) | |
| 82 | +#if !defined(__used) | |
| 83 | +# if __GNUC__ == 3 && __GNUC_MINOR__ < 3 | |
| 84 | +# define __used __attribute__((__unused__)) | |
| 85 | +# else | |
| 86 | +# define __used __attribute__((__used__)) | |
| 87 | +# endif | |
| 86 | 88 | #endif |
| 87 | 89 | |
| 88 | 90 | /* Define a variable f that holds the value of field f of struct devid |