This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit e9c4b96b4720885a3d91f1f7f75163a4f39d8fb2 Author: Randall Meyer <[email protected]> AuthorDate: Mon Feb 1 09:54:30 2021 -0800 Cleans up duplicated TSOutboundConnectionMatchType definition (#7090) --- include/ts/apidefs.h.in | 3 --- proxy/http/HttpProxyAPIEnums.h | 15 --------------- 2 files changed, 18 deletions(-) diff --git a/include/ts/apidefs.h.in b/include/ts/apidefs.h.in index 27e1522..e8ee795 100644 --- a/include/ts/apidefs.h.in +++ b/include/ts/apidefs.h.in @@ -598,8 +598,6 @@ typedef enum { AFTER_BODY, } TSFetchWakeUpOptions; -#ifndef _HTTP_PROXY_API_ENUMS_H_ -#define _HTTP_PROXY_API_ENUMS_H_ /// Values for per server outbound connection tracking group definition. /// See proxy.config.http.per_server.match typedef enum { @@ -608,7 +606,6 @@ typedef enum { TS_SERVER_OUTBOUND_MATCH_HOST, TS_SERVER_OUTBOUND_MATCH_BOTH } TSOutboundConnectionMatchType; -#endif /* librecords types */ diff --git a/proxy/http/HttpProxyAPIEnums.h b/proxy/http/HttpProxyAPIEnums.h index d27b1ab..cd2dfa3 100644 --- a/proxy/http/HttpProxyAPIEnums.h +++ b/proxy/http/HttpProxyAPIEnums.h @@ -56,18 +56,3 @@ typedef enum { TS_SERVER_SESSION_SHARING_POOL_THREAD, TS_SERVER_SESSION_SHARING_POOL_HYBRID } TSServerSessionSharingPoolType; - -// This is use to signal apidefs.h to not define these again. -#ifndef _HTTP_PROXY_API_ENUMS_H_ -#define _HTTP_PROXY_API_ENUMS_H_ - -/// Values for per server outbound connection tracking group definition. -/// See proxy.config.http.per_server.match -typedef enum { - TS_SERVER_OUTBOUND_MATCH_IP, - TS_SERVER_OUTBOUND_MATCH_PORT, - TS_SERVER_OUTBOUND_MATCH_HOST, - TS_SERVER_OUTBOUND_MATCH_BOTH -} TSOutboundConnectionMatchType; - -#endif
