This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.18-33-gf890a59
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Aug 2013 17:56:59 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-33-gf890a59
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via f890a59b10b6a4b8723b86545e8b38ccc690021c (commit)
from 5d1f0a09f3634b29d9cbbd7c7337d546502363cb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f890a59b10b6a4b8723b86545e8b38ccc690021c
commit f890a59b10b6a4b8723b86545e8b38ccc690021c
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue Aug 27 10:49:36 2013 -0700
Mild decrufting in resolv code.
diff --git a/ChangeLog b/ChangeLog
index 4c31935..30d90e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-08-27 Roland McGrath <roland@hack.frob.com>
+ * resolv/res_hconf.c [!NOT_IN_libc] (ifaddrs): Declare
+ only under [SIOCGIFCONF && SIOCGIFNETMASK].
+
+ * resolv/res_mkquery.c: Include <sys/time.h>.
+
* inet/ifreq.c: Moved to ...
* sysdeps/unix/ifreq.c: ... here.
* inet/ifreq.c: New file, true stub version.
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index 8ac4638..a92751b 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -359,6 +359,7 @@ _res_hconf_init (void)
#ifndef NOT_IN_libc
+# if defined SIOCGIFCONF && defined SIOCGIFNETMASK
/* List of known interfaces. */
libc_freeres_ptr (
static struct netaddr
@@ -373,6 +374,7 @@ static struct netaddr
} ipv4;
} u;
} *ifaddrs);
+# endif
/* Reorder addresses returned in a hostent such that the first address
is an address on the local subnet, if there is such an address.
diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index c0798dc..6170763 100644
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -77,6 +77,7 @@ static const char rcsid[] = "$BINDId: res_mkquery.c,v 8.12 1999/10/13 16:39:40 v
#include <resolv.h>
#include <stdio.h>
#include <string.h>
+#include <sys/time.h>
/* Options. Leave them on. */
/* #define DEBUG */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
resolv/res_hconf.c | 2 ++
resolv/res_mkquery.c | 1 +
3 files changed, 8 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources