resolver: preserve binary compatibility; reduce header pollution

In r289315, I added new fields to res_state.  This broke binary
backward compatibility.  It also broke some ports (and possibly
other code) by requiring the definition of time_t and struct timespec.

Fix these problems by moving the new fields into __res_state_ext.

Suggested by:	ume
Reviewed by:	ume
MFC after:	3 days
Sponsored by:	Dell Inc.
Differential Revision:	https://reviews.freebsd.org/D4472

1 files changed, 1 insertions, 5 deletions

diff --git a/include/resolv.h b/include/resolv.h
index f372f94..e3d4fd1 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -57,7 +57,6 @@
 #include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/socket.h>
-#include <sys/timespec.h>
 #include <stdio.h>
 #include <arpa/nameser.h>
 
@@ -177,8 +176,7 @@ struct __res_state {
 	int	res_h_errno;		/*%< last one set for this context */
 	int	_vcsock;		/*%< PRIVATE: for res_send VC i/o */
 	u_int	_flags;			/*%< PRIVATE: see below */
-	u_short	reload_period;		/*%< seconds between stat(resolv.conf)*/
-	u_short	_pad;			/*%< make _u 64 bit aligned */
+	u_int	_pad;			/*%< make _u 64 bit aligned */
 	union {
 		/* On an 32-bit arch this means 512b total. */
 		char	pad[72 - 4*sizeof (int) - 3*sizeof (void *)];
@@ -190,8 +188,6 @@ struct __res_state {
 		} _ext;
 	} _u;
 	u_char	*_rnd;			/*%< PRIVATE: random state */
-	struct timespec	conf_mtim;	/*%< mod time of loaded resolv.conf */
-	time_t		conf_stat;	/*%< time of last stat(resolv.conf) */
 };
 
 typedef struct __res_state *res_state;