Make sure local fts.h is never included by mistake instead of system one.
Signed-off-by: Gleb Fotengauer-Malinovskiy <gle...@altlinux.org>
---
build/files.c | 2 +-
misc/Makefile.am | 2 +-
misc/fts.c | 4 ++--
misc/{fts.h => rpmfts.h} | 0
4 files changed, 4 insertions(+), 4 deletions(-)
rename misc/{fts.h => rpmfts.h} (100%)
diff --git a/build/files.c b/build/files.c
index 6021643..984439d 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 8bf0093..31d264e 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 22509f2..5c6f53d 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
similarity index 100%
rename from misc/fts.h
rename to misc/rpmfts.h
--
glebfm
_______________________________________________
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint
