nss_dns: Remove custom offsetof macro definition

diff --git a/ChangeLog b/ChangeLog
index f1084eed120a482bf09f37d37e5cc85c4b512061..4c8d7bc6c00dae7296bdb6046d341319d097b827 100644 (file)
--- 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 8f301a706b30287a8f8fb270bae8adfca055aae2..99ec7555abb887af3cc1c4874c5ae6916b37c335 100644 (file)
--- 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,