Remove IS_IN_libdl

Replace with IS_IN (libdl).  No changes to generated code on x86_64.

	* dlfcn/dladdr.c: Use IS_IN.
	* dlfcn/dladdr1.c: Likewise.
	* dlfcn/dlclose.c: Likewise.
	* dlfcn/dlerror.c: Likewise.
	* dlfcn/dlinfo.c: Likewise.
	* dlfcn/dlmopen.c: Likewise.
	* dlfcn/dlopen.c: Likewise.
	* dlfcn/dlsym.c: Likewise.
	* dlfcn/dlvsym.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 67aac82dc87f03ba7400a5de44aa27e3a77a9686..65d8f0fe48f631f7825e4bc3c2ba201c2cd64ac2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2014-11-24  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+       * dlfcn/dladdr.c: Use IS_IN.
+       * dlfcn/dladdr1.c: Likewise.
+       * dlfcn/dlclose.c: Likewise.
+       * dlfcn/dlerror.c: Likewise.
+       * dlfcn/dlinfo.c: Likewise.
+       * dlfcn/dlmopen.c: Likewise.
+       * dlfcn/dlopen.c: Likewise.
+       * dlfcn/dlsym.c: Likewise.
+       * dlfcn/dlvsym.c: Likewise.
+
        * include/ifaddrs.h: Use IS_IN.
        * inet/check_pf.c: Likewise.
        * sysdeps/unix/sysv/linux/check_pf.c: Likewise.

diff --git a/dlfcn/dladdr.c b/dlfcn/dladdr.c
index 922ca44daea38466335d9798e0e0197507440d18..2537a035632d5189b04a97f47ae55638e7abde74 100644 (file)
--- a/dlfcn/dladdr.c
+++ b/dlfcn/dladdr.c
@@ -18,7 +18,7 @@
 
 #include <dlfcn.h>
 
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN (libdl)
 
 int
 dladdr (const void *address, Dl_info *info)

diff --git a/dlfcn/dladdr1.c b/dlfcn/dladdr1.c
index 0efc0dcd3d98747c82e32be7d97cdb1bbcee8fb1..fa40dd9d6c70435701a9fa7bb3b26c6fdcc23b4c 100644 (file)
--- a/dlfcn/dladdr1.c
+++ b/dlfcn/dladdr1.c
@@ -18,7 +18,7 @@
 
 #include <dlfcn.h>
 
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN (libdl)
 
 int
 dladdr1 (const void *address, Dl_info *info, void **extra, int flags)

diff --git a/dlfcn/dlclose.c b/dlfcn/dlclose.c
index ca55b5f293be7681897f3ca03ca80c979f1176ba..3446a361174fd8c526ca8252e8d00187b9cda208 100644 (file)
--- a/dlfcn/dlclose.c
+++ b/dlfcn/dlclose.c
@@ -19,7 +19,7 @@
 #include <dlfcn.h>
 #include <ldsodefs.h>
 
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN (libdl)
 
 int
 dlclose (void *handle)

diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c
index 6dd47a7eaf76792324fc955ce76c72c1ddbcfaa7..48b9be2d26b32a1dc571d0421148b7a6a98c89c6 100644 (file)
--- a/dlfcn/dlerror.c
+++ b/dlfcn/dlerror.c
@@ -25,7 +25,7 @@
 #include <bits/libc-lock.h>
 #include <ldsodefs.h>
 
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN (libdl)
 
 char *
 dlerror (void)

diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c
index 1876d9dfe7ac6ec84c9f116e5acd043b879dffb6..30becfb82b7d493b380071f672de81fcf281090a 100644 (file)
--- a/dlfcn/dlinfo.c
+++ b/dlfcn/dlinfo.c
@@ -21,7 +21,7 @@
 #include <ldsodefs.h>
 #include <libintl.h>
 
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN (libdl)
 
 int
 dlinfo (void *handle, int request, void *arg)

diff --git a/dlfcn/dlmopen.c b/dlfcn/dlmopen.c
index 115f6e9e28416903f1509a5f4e43f6bbe07182dc..2905a0e7f964c8e6a1fc3297a28b3b205ce10f64 100644 (file)
--- a/dlfcn/dlmopen.c
+++ b/dlfcn/dlmopen.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN (libdl)
 
 void *
 dlmopen (Lmid_t nsid, const char *file, int mode)

diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c
index fa58c4cebff4bc5d2f087b216a6d2c15b1ffa64b..a724737c1596a22980680eb4848af044d6136e8f 100644 (file)
--- a/dlfcn/dlopen.c
+++ b/dlfcn/dlopen.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN (libdl)
 
 void *
 dlopen (const char *file, int mode)

diff --git a/dlfcn/dlsym.c b/dlfcn/dlsym.c
index 7bcc78d50edf3f65ad7c6ad24cbcd122a03d2927..d852bea8c05172c6edee4a8a5edbe945c2ab37db 100644 (file)
--- a/dlfcn/dlsym.c
+++ b/dlfcn/dlsym.c
@@ -21,7 +21,7 @@
 
 #include <ldsodefs.h>
 
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN (libdl)
 
 void *
 dlsym (void *handle, const char *name)

diff --git a/dlfcn/dlvsym.c b/dlfcn/dlvsym.c
index d7a766b283935a5e31cf0c35cc5ece2934d1c398..2263429414377c32f0a70c98acee18cd3f61d71d 100644 (file)
--- a/dlfcn/dlvsym.c
+++ b/dlfcn/dlvsym.c
@@ -21,7 +21,7 @@
 
 #include <ldsodefs.h>
 
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN (libdl)
 
 void *
 weak_function