This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[hurd,commited] hurd: Fix getifaddrs / freeifaddrs exposition
- From: Samuel Thibault <samuel dot thibault at ens-lyon dot org>
- To: libc-alpha at sourceware dot org
- Cc: Samuel Thibault <samuel dot thibault at ens-lyon dot org>
- Date: Sun, 28 Jan 2018 19:16:19 +0100
- Subject: [hurd,commited] hurd: Fix getifaddrs / freeifaddrs exposition
- Authentication-results: sourceware.org; auth=none
400669754de4 ('hurd: Fix nscd build') had the side effect of making
libc's freeaddrinfo expose freeifaddrs through __check_pf. We can just
move the renames to gai.c itself, along others.
* sysdeps/mach/hurd/check_pf.c (__getifaddrs, __freeifaddrs): Do not
define macros.
* nscd/gai.c (__getifaddrs): Define macro to getifaddrs.
(__freeifaddrs): Define macro to freeifaddrs.
---
ChangeLog | 2 ++
nscd/gai.c | 2 ++
sysdeps/mach/hurd/check_pf.c | 2 --
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ae834cf77d..99e668929e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,8 @@
* hurd/path-lookup.c (hurd_file_name_path_lookup): Likewise.
* sysdeps/mach/hurd/check_native.c: New file.
* sysdeps/mach/hurd/check_pf.c: New file.
+ * nscd/gai.c (__getifaddrs): Define macro to getifaddrs.
+ (__freeifaddrs): Define macro to freeifaddrs.
* sysdeps/mach/hurd/libhurduser.abilist: New file.
* sysdeps/mach/libmachuser.abilist: New file.
* libio/tst-memstream3.c (FWRITE): Rename to _FWRITE.
diff --git a/nscd/gai.c b/nscd/gai.c
index d00a184c46..d081747797 100644
--- a/nscd/gai.c
+++ b/nscd/gai.c
@@ -31,6 +31,8 @@
#define __qsort_r qsort_r
/* nscd uses 1MB or 2MB thread stacks. */
#define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)
+#define __getifaddrs getifaddrs
+#define __freeifaddrs freeifaddrs
/* We are nscd, so we don't want to be talking to ourselves. */
#undef USE_NSCD
diff --git a/sysdeps/mach/hurd/check_pf.c b/sysdeps/mach/hurd/check_pf.c
index 32cc28340b..edd99a7278 100644
--- a/sysdeps/mach/hurd/check_pf.c
+++ b/sysdeps/mach/hurd/check_pf.c
@@ -1,3 +1 @@
-#define __getifaddrs getifaddrs
-#define __freeifaddrs freeifaddrs
#include <inet/check_pf.c>
--
2.15.1