aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-14 09:00:28 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-14 09:00:28 +0000
commit8ba1d42919f932a96d6db7889694d93dffd997c1 (patch)
tree6fb785a9e7795cc283652d55fc98455b2127d3c5
parenta4596570324480a8af6a9a277dadb1c2ff7be3f9 (diff)
downloadglibc-8ba1d42919f932a96d6db7889694d93dffd997c1.zip
glibc-8ba1d42919f932a96d6db7889694d93dffd997c1.tar.gz
glibc-8ba1d42919f932a96d6db7889694d93dffd997c1.tar.bz2
Update.
* sysdeps/unix/sysv/linux/check_pf.c (__check_pf): Use __close, not close. * inet/inet6_option.c (inet6_option_alloc): Add libc_hidden_def. * include/netinet/in.h (inet6_option_alloc): Add libc_hidden_proto definition.
-rw-r--r--ChangeLog7
-rw-r--r--include/netinet/in.h1
-rw-r--r--inet/inet6_option.c1
-rw-r--r--nptl/ChangeLog7
-rw-r--r--nptl/sysdeps/unix/sysv/linux/fork.h1
-rw-r--r--nptl/sysdeps/unix/sysv/linux/register-atfork.c1
-rw-r--r--sysdeps/unix/sysv/linux/check_pf.c4
7 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a69784a..5978f22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2003-06-14 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/check_pf.c (__check_pf): Use __close,
+ not close.
+
+ * inet/inet6_option.c (inet6_option_alloc): Add libc_hidden_def.
+ * include/netinet/in.h (inet6_option_alloc): Add libc_hidden_proto
+ definition.
+
* inet/netinet/ip6.h (IP6OPT_PAD1, IP6OPT_PADn): Define.
* inet/netinet/in.h: Add prototypes for inet6_option_* functions.
* inet/Makefile (routines): Add inet6_option.
diff --git a/include/netinet/in.h b/include/netinet/in.h
index 876f1a4..2018ed2 100644
--- a/include/netinet/in.h
+++ b/include/netinet/in.h
@@ -5,5 +5,6 @@
libc_hidden_proto (bindresvport)
libc_hidden_proto (in6addr_loopback)
libc_hidden_proto (in6addr_any)
+libc_hidden_proto (inet6_option_alloc)
#endif
diff --git a/inet/inet6_option.c b/inet/inet6_option.c
index 9a1e868..2e0fed8 100644
--- a/inet/inet6_option.c
+++ b/inet/inet6_option.c
@@ -214,6 +214,7 @@ inet6_option_alloc (cmsg, datalen, multx, plusy)
return result;
}
+libc_hidden_def (inet6_option_alloc)
/* RFC 2292, 6.3.5
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 3d33589..bb17289 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-14 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/fork.h: Add libc_hidden_proto for
+ __register_atfork.
+ * sysdeps/unix/sysv/linux/register-atfork.c (__register_atfork):
+ Add libc_hidden_def.
+
2003-06-13 Roland McGrath <roland@redhat.com>
* sysdeps/x86_64/td_ta_map_lwp2thr.c (td_ta_map_lwp2thr): Pass FS
diff --git a/nptl/sysdeps/unix/sysv/linux/fork.h b/nptl/sysdeps/unix/sysv/linux/fork.h
index bcdf621..d093ccc 100644
--- a/nptl/sysdeps/unix/sysv/linux/fork.h
+++ b/nptl/sysdeps/unix/sysv/linux/fork.h
@@ -54,3 +54,4 @@ extern int __register_atfork (void (*__prepare) (void),
void (*__parent) (void),
void (*__child) (void),
void *dso_handle);
+libc_hidden_proto (__register_atfork)
diff --git a/nptl/sysdeps/unix/sysv/linux/register-atfork.c b/nptl/sysdeps/unix/sysv/linux/register-atfork.c
index 3177f5a..9707e46 100644
--- a/nptl/sysdeps/unix/sysv/linux/register-atfork.c
+++ b/nptl/sysdeps/unix/sysv/linux/register-atfork.c
@@ -106,6 +106,7 @@ __register_atfork (prepare, parent, child, dso_handle)
return newp == NULL ? ENOMEM : 0;
}
+libc_hidden_def (__register_atfork)
libc_freeres_fn (free_mem)
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index 0bc57da..83a337c 100644
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -115,7 +115,7 @@ make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6)
}
while (! done);
- close (fd);
+ __close (fd);
return 0;
}
@@ -153,7 +153,7 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6)
return;
if (fd >= 0)
- close (fd);
+ __close (fd);
#if __ASSUME_NETLINK_SUPPORT == 0
/* Remember that there is no netlink support. */