* [hurd,commited] hurd: Fix getifaddrs / freeifaddrs exposition
@ 2018-01-29 12:19 Samuel Thibault
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Thibault @ 2018-01-29 12:19 UTC (permalink / raw)
To: libc-alpha; +Cc: Samuel Thibault
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [hurd,commited] hurd: Fix getifaddrs / freeifaddrs exposition
@ 2018-01-29 9:58 Samuel Thibault
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Thibault @ 2018-01-29 9:58 UTC (permalink / raw)
To: libc-alpha; +Cc: Samuel Thibault
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-28 18:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-29 12:19 [hurd,commited] hurd: Fix getifaddrs / freeifaddrs exposition Samuel Thibault
-- strict thread matches above, loose matches on Subject: below --
2018-01-29 9:58 Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).