diff options
| author | peter <peter@FreeBSD.org> | 1997-06-27 08:32:38 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-06-27 08:32:38 +0000 |
| commit | 43ce0607349ff09b87048f834e20b8c30ad81336 (patch) | |
| tree | 3ff38a6ed743c07d69896ca44813bad69b680251 | |
| parent | 63d61ea6e9374a89adcb36c3f5c3b759b9a82c41 (diff) | |
| download | FreeBSD-src-43ce0607349ff09b87048f834e20b8c30ad81336.zip FreeBSD-src-43ce0607349ff09b87048f834e20b8c30ad81336.tar.gz | |
merge in bind-4.9.6 changes (only effect is __res_send #define reverted)
| -rw-r--r-- | include/netdb.h | 4 | ||||
| -rw-r--r-- | include/resolv.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/netdb.h b/include/netdb.h index 2f8619b..bb6984f 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -31,8 +31,8 @@ * SUCH DAMAGE. * * @(#)netdb.h 8.1 (Berkeley) 6/2/93 - * From: Id: netdb.h,v 8.7 1996/05/09 05:59:09 vixie Exp - * $Id$ + * From: Id: netdb.h,v 8.8 1997/06/01 20:34:32 vixie Exp + * $Id: netdb.h,v 1.8 1997/02/23 09:17:14 peter Exp $ * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. * diff --git a/include/resolv.h b/include/resolv.h index 33551a0..d49c172 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -52,8 +52,8 @@ * --Copyright-- * * @(#)resolv.h 8.1 (Berkeley) 6/2/93 - * From Id: resolv.h,v 8.17 1996/11/26 10:11:20 vixie Exp - * $Id: resolv.h,v 1.11 1997/05/07 02:26:36 eivind Exp $ + * From Id: resolv.h,v 8.18 1997/06/01 20:34:32 vixie Exp + * $Id: resolv.h,v 1.12 1997/05/07 20:00:10 eivind Exp $ */ #ifndef _RESOLV_H_ @@ -219,7 +219,6 @@ extern const struct res_sym __p_type_syms[]; #define dn_count_labels __dn_count_labels #define dn_comp __dn_comp #define res_randomid __res_randomid -#define res_send __res_send #define res_isourserver __res_isourserver #define res_nameinquery __res_nameinquery #define res_queriesmatch __res_queriesmatch @@ -232,6 +231,7 @@ extern const struct res_sym __p_type_syms[]; #define res_search __res_search #define res_querydomain __res_querydomain #define res_mkquery __res_mkquery +#define res_send __res_send #endif __BEGIN_DECLS |
