GNU C Library master sources branch master updated. glibc-2.24-164-g1d2ea31

[fw at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  1d2ea31ca95adcd68085f487629e0a1b569c7d63 (commit)
      from  e299076fefd9649f78f853865d4745043e50813c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1d2ea31ca95adcd68085f487629e0a1b569c7d63

commit 1d2ea31ca95adcd68085f487629e0a1b569c7d63
Author: Florian Weimer <fweimer@redhat.com>
Date:   Wed Sep 21 10:42:52 2016 +0200

    sln: Preprocessor cleanups

diff --git a/ChangeLog b/ChangeLog
index a962c8e..2e29b7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-21  Florian Weimer  <fweimer@redhat.com>
+
+	* elf/sln.c: Remove HAVE_CONFIG_H, S_ISDIR, S_ISLNK preprocessor
+	conditionals.  Do not define PATH_MAX.
+
 2016-09-20  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/unix/sysv/linux/spawni.c (__spawnix): Correctly block and unblock
diff --git a/elf/sln.c b/elf/sln.c
index f52cb9f..fa4ccec 100644
--- a/elf/sln.c
+++ b/elf/sln.c
@@ -16,10 +16,6 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <error.h>
 #include <errno.h>
 #include <libintl.h>
@@ -37,10 +33,6 @@
 
 #define PACKAGE _libc_intl_domainname
 
-#if !defined S_ISDIR && defined S_IFDIR
-#define	S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-
 static int makesymlink (const char *src, const char *dest);
 static int makesymlinks (const char *file);
 static void usage (void);
@@ -89,9 +81,6 @@ usage (void)
 static int
 makesymlinks (const char *file)
 {
-#ifndef PATH_MAX
-#define PATH_MAX 4095
-#endif
   char *buffer = NULL;
   size_t bufferlen = 0;
   int ret;
@@ -190,11 +179,7 @@ makesymlink (const char *src, const char *dest)
       return -1;
     }
 
-#ifdef S_ISLNK
   if (symlink (src, dest) == 0)
-#else
-  if (link (src, dest) == 0)
-#endif
     {
       /* Destination must exist by now. */
       if (access (dest, F_OK))

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    5 +++++
 elf/sln.c |   15 ---------------
 2 files changed, 5 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources