diff options
| author | Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org> | 2017-03-23 21:20:46 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2017-03-24 12:29:24 +0200 |
| commit | 418d1b69e1ab36d3faba6dd2dfb7758aa63cd557 (patch) | |
| tree | 4ee90103a4f61ff9cfb71b7892d245cb22d4072e | |
| parent | 7774654ed1317335c75bc218e31639101797641b (diff) | |
| download | rpm-418d1b69e1ab36d3faba6dd2dfb7758aa63cd557.tar.gz | |
Rename fts.h header to rpmfts.h
Make sure local fts.h is never included by mistake instead of system one.
Signed-off-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
| -rw-r--r-- | build/files.c | 2 | ||||
| -rw-r--r-- | misc/Makefile.am | 2 | ||||
| -rw-r--r-- | misc/fts.c | 4 | ||||
| -rw-r--r-- | misc/rpmfts.h (renamed from misc/fts.h) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/build/files.c b/build/files.c index d7b140e15..07b42d9d3 100644 --- a/build/files.c +++ b/build/files.c @@ -28,7 +28,7 @@ #include <rpm/rpmbase64.h> #include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */ -#include "misc/fts.h" +#include "misc/rpmfts.h" #include "lib/rpmfi_internal.h" /* XXX fi->apath */ #include "lib/rpmug.h" #include "build/rpmbuild_internal.h" diff --git a/misc/Makefile.am b/misc/Makefile.am index 8bf0093d9..31d264e1d 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -10,5 +10,5 @@ EXTRA_DIST = \ noinst_LTLIBRARIES = libmisc.la -libmisc_la_SOURCES = fts.c fts.h +libmisc_la_SOURCES = fts.c rpmfts.h libmisc_la_LIBADD = @LTLIBOBJS@ diff --git a/misc/fts.c b/misc/fts.c index 22509f29e..5c6f53d40 100644 --- a/misc/fts.c +++ b/misc/fts.c @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #include <fcntl.h> #include <dirent.h> #include <errno.h> -#include "misc/fts.h" +#include "misc/rpmfts.h" #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -69,7 +69,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #include <stdlib.h> #include <string.h> #include <errno.h> -#include "misc/fts.h" +#include "misc/rpmfts.h" # define __set_errno(val) (*__errno_location ()) = (val) # define __open open # define __close close diff --git a/misc/fts.h b/misc/rpmfts.h index 30ad0ee8e..30ad0ee8e 100644 --- a/misc/fts.h +++ b/misc/rpmfts.h |