You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2020/03/09 15:59:48 UTC

[trafficserver] branch 9.0.x updated: Remove dependencies on include/tscore

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 518e94a  Remove dependencies on include/tscore
518e94a is described below

commit 518e94a5472e995412a67cb74643a0b489619e63
Author: Ed Hall <ed...@verizonmedia.com>
AuthorDate: Thu Jan 30 22:55:10 2020 +0000

    Remove dependencies on include/tscore
    
    (cherry picked from commit 01914247e96c95e94244a70f498e947569180f68)
---
 plugins/lua/ts_lua.c                | 1 +
 plugins/lua/ts_lua_client_request.c | 2 +-
 plugins/lua/ts_lua_common.h         | 6 +++++-
 plugins/lua/ts_lua_misc.c           | 2 +-
 plugins/lua/ts_lua_server_request.c | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/lua/ts_lua.c b/plugins/lua/ts_lua.c
index c88096c..86ee84d 100644
--- a/plugins/lua/ts_lua.c
+++ b/plugins/lua/ts_lua.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <pthread.h>
 #include <getopt.h>
+#include <inttypes.h>
 
 #include "ts_lua_util.h"
 
diff --git a/plugins/lua/ts_lua_client_request.c b/plugins/lua/ts_lua_client_request.c
index e5c8c62..a78b5b9 100644
--- a/plugins/lua/ts_lua_client_request.c
+++ b/plugins/lua/ts_lua_client_request.c
@@ -16,8 +16,8 @@
   limitations under the License.
 */
 
-#include "tscore/ink_platform.h"
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include "ts_lua_util.h"
 
 static void ts_lua_inject_client_request_client_addr_api(lua_State *L);
diff --git a/plugins/lua/ts_lua_common.h b/plugins/lua/ts_lua_common.h
index 628eb09..d076ae1 100644
--- a/plugins/lua/ts_lua_common.h
+++ b/plugins/lua/ts_lua_common.h
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <inttypes.h>
 
 #include "lua.h"
 #include "lualib.h"
@@ -29,7 +30,6 @@
 #include <ts/ts.h>
 #include <ts/experimental.h>
 #include <ts/remap.h>
-#include "tscore/ink_defs.h"
 #include "ts_lua_coroutine.h"
 
 #define TS_LUA_FUNCTION_REMAP "do_remap"
@@ -177,3 +177,7 @@ typedef struct {
       ih->buffer = NULL;                \
     }                                   \
   } while (0)
+
+#ifndef ATS_UNUSED
+#define ATS_UNUSED __attribute__((unused))
+#endif
diff --git a/plugins/lua/ts_lua_misc.c b/plugins/lua/ts_lua_misc.c
index e12e5a1..30e362a 100644
--- a/plugins/lua/ts_lua_misc.c
+++ b/plugins/lua/ts_lua_misc.c
@@ -16,8 +16,8 @@
   limitations under the License.
 */
 
-#include "tscore/ink_platform.h"
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include "ts_lua_util.h"
 
 static int ts_lua_get_process_id(lua_State *L);
diff --git a/plugins/lua/ts_lua_server_request.c b/plugins/lua/ts_lua_server_request.c
index 8e65fe3..6b5cf85 100644
--- a/plugins/lua/ts_lua_server_request.c
+++ b/plugins/lua/ts_lua_server_request.c
@@ -16,8 +16,8 @@
   limitations under the License.
 */
 
-#include "tscore/ink_platform.h"
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include "ts_lua_util.h"
 
 #define TS_LUA_CHECK_SERVER_REQUEST_HDR(http_ctx)                                                                                \