Skip to content

Commit

Permalink
perf tools: Convert to HAVE_STRLCPY
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Namhyung Kim authored and Arnaldo Carvalho de Melo committed Oct 2, 2012
1 parent f9f526e commit d6e6683
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
8 changes: 3 additions & 5 deletions tools/perf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -743,11 +743,9 @@ ifeq ($(NO_PERF_REGS),0)
BASIC_CFLAGS += -DHAVE_PERF_REGS
endif

ifdef NO_STRLCPY
BASIC_CFLAGS += -DNO_STRLCPY
else
ifneq ($(call try-cc,$(SOURCE_STRLCPY),),y)
BASIC_CFLAGS += -DNO_STRLCPY
ifndef NO_STRLCPY
ifeq ($(call try-cc,$(SOURCE_STRLCPY),),y)
BASIC_CFLAGS += -DHAVE_STRLCPY
endif
endif

Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ extern char *perf_path(const char *fmt, ...) __attribute__((format (printf, 1, 2
extern char *perf_pathdup(const char *fmt, ...)
__attribute__((format (printf, 1, 2)));

#ifdef NO_STRLCPY
#ifndef HAVE_STRLCPY
extern size_t strlcpy(char *dest, const char *src, size_t size);
#endif

Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/path.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ static const char *get_perf_dir(void)
return ".";
}

#ifdef NO_STRLCPY
#ifndef HAVE_STRLCPY
size_t strlcpy(char *dest, const char *src, size_t size)
{
size_t ret = strlen(src);
Expand Down

0 comments on commit d6e6683

Please sign in to comment.