[Glibc-bsd-commits] r5788 - trunk/glibc-ports/kfreebsd/x86_64

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-10-20 12:50:05 +0000 (Tue, 20 Oct 2015)
New Revision: 5788

Modified:
   trunk/glibc-ports/kfreebsd/x86_64/dl-procinfo.h
Log:
Merge from upstream:

commit fb6784e3068a747ead34e6dee6a9a1978668a955
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Thu Nov 20 12:33:44 2014 +0530

    Remove IS_IN_ldconfig
    
    Replace with IS_IN (ldconfig).  No change in generated code.
    
        * elf/Makefile (CFLAGS-ldconfig.c): Remove definition of
        IS_IN_ldconfig.
        * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: Use IS_IN.
        * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h: Likewise.



Modified: trunk/glibc-ports/kfreebsd/x86_64/dl-procinfo.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/dl-procinfo.h	2015-10-20 12:48:59 UTC (rev 5787)
+++ trunk/glibc-ports/kfreebsd/x86_64/dl-procinfo.h	2015-10-20 12:50:05 UTC (rev 5788)
@@ -1,4 +1,4 @@
-#ifdef IS_IN_ldconfig
+#ifdef IS_IN (ldconfig)
 # include <sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/dl-procinfo.h>
 #else
 # include <sysdeps/generic/dl-procinfo.h>