diff options
| author | Hitoshi Mitake | 2010-04-04 10:13:18 +0200 |
|---|---|---|
| committer | Frederic Weisbecker | 2010-04-04 16:40:42 +0200 |
| commit | 8141d0050d76e5695011b5ab577ec66fb51a998c (patch) | |
| tree | 9f663a99bea3baa0c6005247494ca3227ba850a9 /tools/perf/util/string.c | |
| parent | perf_event: Make perf fd non seekable (diff) | |
| download | kernel-qcow2-linux-8141d0050d76e5695011b5ab577ec66fb51a998c.tar.gz kernel-qcow2-linux-8141d0050d76e5695011b5ab577ec66fb51a998c.tar.xz kernel-qcow2-linux-8141d0050d76e5695011b5ab577ec66fb51a998c.zip | |
perf: Swap inclusion order of util.h and string.h in util/string.c
Currently util/string.c includes headers in this order: string.h, util.h
But this causes a build error because __USE_GNU definition
is needed for strndup() definition:
% make -j
touch .perf.dev.null
CC util/string.o
cc1: warnings being treated as errors
util/string.c: In function ‘argv_split’:
util/string.c:171: error: implicit declaration of function ‘strndup’
util/string.c:171: error: incompatible implicit declaration of built-in function ‘strndup’
So this patch swaps the headers inclusion order.
util.h defines _GNU_SOURCE, and /usr/include/features.h defines
__USE_GNU as 1 if _GNU_SOURCE is defined.
Signed-off-by: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <1270368798-27232-1-git-send-email-mitake@dcl.info.waseda.ac.jp>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'tools/perf/util/string.c')
| -rw-r--r-- | tools/perf/util/string.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/string.c b/tools/perf/util/string.c index d4389242cfd7..0409fc7c0058 100644 --- a/tools/perf/util/string.c +++ b/tools/perf/util/string.c @@ -1,5 +1,5 @@ -#include "string.h" #include "util.h" +#include "string.h" #define K 1024LL /* |