aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2012-09-28 05:32:08 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-10-02 17:36:24 -0400
commitd6e66832a710c0e6d1376e8d39ee108636a177e7 (patch)
tree9398a9aea2316d7ae171ce97b3929aeaf2930252
parentf9f526ecdc09a851f4f5567ebcf9bc553778f6c2 (diff)
perf tools: Convert to HAVE_STRLCPY
For similar reason of previous patches, convert NO_STRLCPY to positive HAVE_STRLCPY. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1348824728-14025-13-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/Makefile8
-rw-r--r--tools/perf/util/cache.h2
-rw-r--r--tools/perf/util/path.c2
3 files changed, 5 insertions, 7 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 31a07f95fd98..5216ade909d0 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -743,11 +743,9 @@ ifeq ($(NO_PERF_REGS),0)
743 BASIC_CFLAGS += -DHAVE_PERF_REGS 743 BASIC_CFLAGS += -DHAVE_PERF_REGS
744endif 744endif
745 745
746ifdef NO_STRLCPY 746ifndef NO_STRLCPY
747 BASIC_CFLAGS += -DNO_STRLCPY 747 ifeq ($(call try-cc,$(SOURCE_STRLCPY),),y)
748else 748 BASIC_CFLAGS += -DHAVE_STRLCPY
749 ifneq ($(call try-cc,$(SOURCE_STRLCPY),),y)
750 BASIC_CFLAGS += -DNO_STRLCPY
751 endif 749 endif
752endif 750endif
753 751
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index 07aec06e4443..2bd51370ad28 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -107,7 +107,7 @@ extern char *perf_path(const char *fmt, ...) __attribute__((format (printf, 1, 2
107extern char *perf_pathdup(const char *fmt, ...) 107extern char *perf_pathdup(const char *fmt, ...)
108 __attribute__((format (printf, 1, 2))); 108 __attribute__((format (printf, 1, 2)));
109 109
110#ifdef NO_STRLCPY 110#ifndef HAVE_STRLCPY
111extern size_t strlcpy(char *dest, const char *src, size_t size); 111extern size_t strlcpy(char *dest, const char *src, size_t size);
112#endif 112#endif
113 113
diff --git a/tools/perf/util/path.c b/tools/perf/util/path.c
index bd7497711424..a8c49548ca48 100644
--- a/tools/perf/util/path.c
+++ b/tools/perf/util/path.c
@@ -22,7 +22,7 @@ static const char *get_perf_dir(void)
22 return "."; 22 return ".";
23} 23}
24 24
25#ifdef NO_STRLCPY 25#ifndef HAVE_STRLCPY
26size_t strlcpy(char *dest, const char *src, size_t size) 26size_t strlcpy(char *dest, const char *src, size_t size)
27{ 27{
28 size_t ret = strlen(src); 28 size_t ret = strlen(src);