mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-02 12:20:51 +00:00
merge in bind-4.9.6 changes (only effect is __res_send #define reverted)
This commit is contained in:
parent
6c5aff806e
commit
4ebe87f9cc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=26975
@ -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.
|
||||
*
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user