hurd: Fix getifaddrs / freeifaddrs exposition

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.

diff --git a/ChangeLog b/ChangeLog
index ae834cf77d214f8e04ec9ce071d068dc33555580..99e668929ed27c340de1ee6291bbcfed2e50a55e 100644 (file)
--- 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 d00a184c46cc0dd74ab01c6805bd4d73b27ffd9f..d0817477976c0bdf95f9b28ee9f71ebaf14de199 100644 (file)
--- 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 32cc28340b5abd9bd9cde1ee3980f49046369d8f..edd99a727867d655a74e1798b11ad675027cdbd2 100644 (file)
--- 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>