aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-11-20 13:17:21 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-11-24 11:41:44 +0530
commit9b42a0b3a3cc037e6bdd62869d91cb19c80aa0e5 (patch)
tree68e237c51758b017e146ba59a547b1ecd3b919e8
parentRemove IS_IN_nscd (diff)
downloadglibc-9b42a0b3a3cc037e6bdd62869d91cb19c80aa0e5.tar.gz
glibc-9b42a0b3a3cc037e6bdd62869d91cb19c80aa0e5.tar.bz2
glibc-9b42a0b3a3cc037e6bdd62869d91cb19c80aa0e5.zip
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.
-rw-r--r--ChangeLog10
-rw-r--r--dlfcn/dladdr.c2
-rw-r--r--dlfcn/dladdr1.c2
-rw-r--r--dlfcn/dlclose.c2
-rw-r--r--dlfcn/dlerror.c2
-rw-r--r--dlfcn/dlinfo.c2
-rw-r--r--dlfcn/dlmopen.c2
-rw-r--r--dlfcn/dlopen.c2
-rw-r--r--dlfcn/dlsym.c2
-rw-r--r--dlfcn/dlvsym.c2
10 files changed, 19 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 67aac82dc8..65d8f0fe48 100644
--- 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 922ca44dae..2537a03563 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 0efc0dcd3d..fa40dd9d6c 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 ca55b5f293..3446a36117 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 6dd47a7eaf..48b9be2d26 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 1876d9dfe7..30becfb82b 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 115f6e9e28..2905a0e7f9 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 fa58c4cebf..a724737c15 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 7bcc78d50e..d852bea8c0 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 d7a766b283..2263429414 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