From f049c775a7dfd6ffeb9248e24b627a87f2d7532f Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 5 Apr 2010 14:10:26 +0200 Subject: [PATCH] frcode: avoid link failure due to multiple program_name definitions * locate/frcode.c: Include "progname.h". (program_name): Remove two declarations. Now the definition comes from gnulib. --- ChangeLog | 7 +++++++ locate/frcode.c | 8 +------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 709235af..ae1ff04f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-04-05 Jim Meyering + + frcode: avoid link failure due to multiple program_name definition + * locate/frcode.c: Include "progname.h". + (program_name): Remove two declarations. + Now the definition comes from gnulib. + 2010-04-04 James Youngman Fix Savannah bug #29435: fd_is_cloexec does not work on Fedora diff --git a/locate/frcode.c b/locate/frcode.c index 85f5619a..0e144d57 100644 --- a/locate/frcode.c +++ b/locate/frcode.c @@ -102,12 +102,10 @@ #include "error.h" #include "closeout.h" #include "findutils-version.h" +#include "progname.h" char *xmalloc PARAMS((size_t)); -/* The name this program was run with. */ -char *program_name; - /* Write out a 16-bit int, high byte first (network byte order). * Return true iff all went well. */ @@ -151,10 +149,6 @@ static struct option const longopts[] = extern char *version_string; -/* The name this program was run with. */ -char *program_name; - - static void usage (FILE *stream) {