[10/19] Remove IS_IN_libdl

Message ID 1408618663-2281-11-git-send-email-siddhesh@redhat.com
State Committed
Headers

Commit Message

Siddhesh Poyarekar Aug. 21, 2014, 10:57 a.m. UTC
  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.
---
 dlfcn/dladdr.c  | 2 +-
 dlfcn/dladdr1.c | 2 +-
 dlfcn/dlclose.c | 2 +-
 dlfcn/dlerror.c | 2 +-
 dlfcn/dlinfo.c  | 2 +-
 dlfcn/dlmopen.c | 2 +-
 dlfcn/dlopen.c  | 2 +-
 dlfcn/dlsym.c   | 2 +-
 dlfcn/dlvsym.c  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
  

Comments

Roland McGrath Aug. 22, 2014, 6:30 p.m. UTC | #1
OK
  

Patch

diff --git a/dlfcn/dladdr.c b/dlfcn/dladdr.c
index 922ca44..2537a03 100644
--- 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 0efc0dc..fa40dd9 100644
--- 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 ca55b5f..3446a36 100644
--- 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 6dd47a7..48b9be2 100644
--- 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 1876d9d..30becfb 100644
--- 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 115f6e9..2905a0e 100644
--- 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 fa58c4c..a724737 100644
--- 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 7bcc78d..d852bea 100644
--- 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 d7a766b..2263429 100644
--- 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