You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2017/12/06 04:50:20 UTC

[trafficserver] 01/02: Fix build errors for glibc 2.25

This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch 6.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit e90c3617f6bc4f99453049f8772517c3d9e53eb9
Author: Daniel Xu <dx...@dxuuu.xyz>
AuthorDate: Thu May 4 15:49:14 2017 -0500

    Fix build errors for glibc 2.25
    
    glibc 2.25 removes a few symbols for resolving related stuff. ATS never
    even used those symbols anyways so let's just delete them.
    
    (cherry picked from commit f5e201962d9ace4079ce68df7348c9713651674d)
    
     Conflicts:
    	lib/ts/ink_res_init.cc
---
 lib/ts/ink_res_init.cc | 2 --
 lib/ts/ink_resolver.h  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/lib/ts/ink_res_init.cc b/lib/ts/ink_res_init.cc
index f52838b..a779ae0 100644
--- a/lib/ts/ink_res_init.cc
+++ b/lib/ts/ink_res_init.cc
@@ -320,8 +320,6 @@ ink_res_init(ink_res_state statp,         ///< State object to update.
   statp->pfcode  = 0;
   statp->_vcsock = -1;
   statp->_flags  = 0;
-  statp->qhook   = NULL;
-  statp->rhook   = NULL;
 
 #ifdef SOLARIS2
   /*
diff --git a/lib/ts/ink_resolver.h b/lib/ts/ink_resolver.h
index a52751f..39924cf 100644
--- a/lib/ts/ink_resolver.h
+++ b/lib/ts/ink_resolver.h
@@ -256,8 +256,6 @@ struct ts_imp_res_state {
   unsigned ndots : 4; /*%< threshold for initial abs. query */
   unsigned nsort : 4; /*%< number of elements in sort_list[] */
   char unused[3];
-  res_send_qhook qhook;         /*%< query hook */
-  res_send_rhook rhook;         /*%< response hook */
   int res_h_errno;              /*%< last one set for this context */
   int _vcsock;                  /*%< PRIVATE: for res_send VC i/o */
   unsigned _flags;              /*%< PRIVATE: see below */

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.