From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 27 Apr 2016 14:48:45 +0000 (+0200)
Subject: nss_dns: Remove custom offsetof macro definition
X-Git-Tag: glibc-2.24~329
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3bae689d30c46c56c695d5b4c61b88e3b178d92;p=thirdparty%2Fglibc.git

nss_dns: Remove custom offsetof macro definition
---

diff --git a/ChangeLog b/ChangeLog
index f1084eed120..4c8d7bc6c00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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]
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index 8f301a706b3..99ec7555abb 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,