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.23-249-gc3bae68
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Apr 2016 14:55:17 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-249-gc3bae68
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 c3bae689d30c46c56c695d5b4c61b88e3b178d92 (commit)
from 5e0c421cc07e2d06945b863ed3bb92395472705d (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=c3bae689d30c46c56c695d5b4c61b88e3b178d92
commit c3bae689d30c46c56c695d5b4c61b88e3b178d92
Author: Florian Weimer <fweimer@redhat.com>
Date: Wed Apr 27 16:48:45 2016 +0200
nss_dns: Remove custom offsetof macro definition
diff --git a/ChangeLog b/ChangeLog
index f1084ee..4c8d7bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2016-04-27 Florian Weimer <fweimer@redhat.com>
+ * resolv/nss_dns/dns-network.c (offsetof): Remove macro
+ definition. Include <stddef.h> instead.
+
+2016-04-27 Florian Weimer <fweimer@redhat.com>
+
[BZ #19831]
* resolv/nss_dns/dns-host.c (rrtype_to_rdata_length): New
function.
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index 8f301a7..99ec755 100644
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -62,6 +62,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
+#include <stddef.h>
#include "nsswitch.h"
#include <arpa/inet.h>
@@ -234,9 +235,6 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result,
}
-#undef offsetof
-#define offsetof(Type, Member) ((size_t) &((Type *) NULL)->Member)
-
static enum nss_status
getanswer_r (const querybuf *answer, int anslen, struct netent *result,
char *buffer, size_t buflen, int *errnop, int *h_errnop,
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
resolv/nss_dns/dns-network.c | 4 +---
2 files changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources