RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Jul-2007 14:51:18
Branch: HEAD Handle: 2007071713511701
Modified files:
rpm CHANGES
rpm/rpmio fts.c fts.h
Log:
Small cleanup: move remaining _D_EXACT_NAMLEN fiddling from public
rpmio/fts.h to private rpmio/fts.c.
Summary:
Revision Changes Path
1.1484 +1 -0 rpm/CHANGES
1.16 +5 -0 rpm/rpmio/fts.c
1.16 +0 -12 rpm/rpmio/fts.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1483 -r1.1484 CHANGES
--- rpm/CHANGES 17 Jul 2007 12:22:20 -0000 1.1483
+++ rpm/CHANGES 17 Jul 2007 12:51:17 -0000 1.1484
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - rse: move remaining _D_EXACT_NAMLEN fiddling from public rpmio/fts.h
to private rpmio/fts.c
- rse: allow building without POSIX pthreads (explicitly through
--without-pthreads or if platform doesn't support it)
- rse: provide "install-sh" script in %{_rpmhome} as a companion to
"mkinstalldirs"
- rse: fix %{__mkdir_p} macro fallback value by installing missing
"mkinstalldirs" into %{_rpmhome}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/fts.c
============================================================================
$ cvs diff -u -r1.15 -r1.16 fts.c
--- rpm/rpmio/fts.c 20 Jun 2007 09:25:02 -0000 1.15
+++ rpm/rpmio/fts.c 17 Jul 2007 12:51:18 -0000 1.16
@@ -52,6 +52,7 @@
# define stat64 stat
# define _STAT_VER 0
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
+# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
#endif
#if defined(sun)
# define __errno_location() (&errno)
@@ -69,6 +70,10 @@
# define __errno_location() (&errno)
# define stat64 stat
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
+# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
+#endif
+#if !defined(_D_EXACT_NAMLEN)
+# define _D_EXACT_NAMLEN(d) (strlen((d)->d_name))
#endif
#include "system.h"
#include "fts.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/fts.h
============================================================================
$ cvs diff -u -r1.15 -r1.16 fts.h
--- rpm/rpmio/fts.h 20 Jun 2007 09:58:41 -0000 1.15
+++ rpm/rpmio/fts.h 17 Jul 2007 12:51:18 -0000 1.16
@@ -35,23 +35,11 @@
#if defined(__GLIBC__)
#include <features.h>
#else
-
# define __THROW
-
#if defined(hpux) || defined(__hpux)
-# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
# define _INCLUDE_POSIX_SOURCE
# define _LARGEFILE64_SOURCE
#endif
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
-#endif
-
-#if !defined(_D_EXACT_NAMLEN)
-# define _D_EXACT_NAMLEN(d) (strlen((d)->d_name))
-#endif
-
#endif
#include <sys/types.h>
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
