Remove unneeded exports from mod_lua.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487956 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/lua/lua_apr.c b/modules/lua/lua_apr.c
index 59a91e550ff5a54a012a461817bc4b6cc5503012..8a1dcf6811e51775a5a07fd64a5cbbfa64252c0a 100644 (file)
--- a/modules/lua/lua_apr.c
+++ b/modules/lua/lua_apr.c
@@ -18,7 +18,7 @@
 #include "mod_lua.h"
 #include "lua_apr.h"
 
-AP_LUA_DECLARE(apr_table_t *) ap_lua_check_apr_table(lua_State *L, int index)
+apr_table_t *ap_lua_check_apr_table(lua_State *L, int index)
 {
     apr_table_t *t;
     luaL_checkudata(L, index, "Apr.Table");
@@ -27,7 +27,7 @@ AP_LUA_DECLARE(apr_table_t *) ap_lua_check_apr_table(lua_State *L, int index)
 }
 
 
-AP_LUA_DECLARE(void) ap_lua_push_apr_table(lua_State *L, apr_table_t *t)
+void ap_lua_push_apr_table(lua_State *L, apr_table_t *t)
 {
     lua_boxpointer(L, t);
     luaL_getmetatable(L, "Apr.Table");
@@ -60,7 +60,7 @@ static const luaL_Reg lua_table_methods[] = {
 };
 
 
-AP_LUA_DECLARE(int) ap_lua_init(lua_State *L, apr_pool_t *p)
+int ap_lua_init(lua_State *L, apr_pool_t *p)
 {
     luaL_newmetatable(L, "Apr.Table");
     luaL_register(L, "apr_table", lua_table_methods);

diff --git a/modules/lua/lua_apr.h b/modules/lua/lua_apr.h
index a7ae64b45208e70ddd0270aacbff315dec760ab8..8a1428ffbba70c85ee16db8a4da40ef7f52ce5ef 100644 (file)
--- a/modules/lua/lua_apr.h
+++ b/modules/lua/lua_apr.h
@@ -29,8 +29,8 @@
 #include "apr_base64.h"
 
 
-AP_LUA_DECLARE(int) ap_lua_init(lua_State *L, apr_pool_t * p);
-AP_LUA_DECLARE(apr_table_t*) ap_lua_check_apr_table(lua_State *L, int index);
-AP_LUA_DECLARE(void) ap_lua_push_apr_table(lua_State *L, apr_table_t *t);
+int ap_lua_init(lua_State *L, apr_pool_t * p);
+apr_table_t *ap_lua_check_apr_table(lua_State *L, int index);
+void ap_lua_push_apr_table(lua_State *L, apr_table_t *t);
 
 #endif /* !_LUA_APR_H_ */

diff --git a/modules/lua/lua_config.c b/modules/lua/lua_config.c
index 07dd932b85689f6417fe9312ad27650794746140..bb082380732ac4e926120ae86cc468a043558434 100644 (file)
--- a/modules/lua/lua_config.c
+++ b/modules/lua/lua_config.c
@@ -51,7 +51,7 @@ static int apl_toscope(const char *name)
     return AP_LUA_SCOPE_ONCE;
 }
 
-AP_LUA_DECLARE(apr_status_t) ap_lua_map_handler(ap_lua_dir_cfg *cfg,
+apr_status_t ap_lua_map_handler(ap_lua_dir_cfg *cfg,
                                                  const char *file,
                                                  const char *function,
                                                  const char *pattern,
@@ -257,7 +257,7 @@ static const struct luaL_Reg cmd_methods[] = {
     {NULL, NULL}
 };
 
-AP_LUA_DECLARE(void) ap_lua_load_config_lmodule(lua_State *L)
+void ap_lua_load_config_lmodule(lua_State *L)
 {
     luaL_newmetatable(L, "Apache2.DirConfig");  /* [metatable] */
     lua_pushvalue(L, -1);

diff --git a/modules/lua/lua_config.h b/modules/lua/lua_config.h
index d2689da1aaee41b9df6656afb2371c7e7af8e9f3..8a778ad87e81b4aa4f39660db7e0d06f744cdf3f 100644 (file)
--- a/modules/lua/lua_config.h
+++ b/modules/lua/lua_config.h
@@ -20,9 +20,9 @@
 #ifndef _APL_CONFIG_H_
 #define _APL_CONFIG_H_
 
-AP_LUA_DECLARE(void) ap_lua_load_config_lmodule(lua_State *L);
+void ap_lua_load_config_lmodule(lua_State *L);
 
-AP_LUA_DECLARE(apr_status_t) ap_lua_map_handler(ap_lua_dir_cfg *cfg,
+apr_status_t ap_lua_map_handler(ap_lua_dir_cfg *cfg,
                                                 const char *file,
                                                 const char *function,
                                                 const char *pattern,

diff --git a/modules/lua/lua_dbd.c b/modules/lua/lua_dbd.c
index ffb6cb6dd78dae21ed24e1ac325668bc7108dbac..501156f803e1217d4d9885fb803cfc34355f40fa 100644 (file)
--- a/modules/lua/lua_dbd.c
+++ b/modules/lua/lua_dbd.c
@@ -703,7 +703,7 @@ static lua_db_handle* lua_push_db_handle(lua_State *L, request_rec* r, int type,
     supported.
    =============================================================================
  */
-AP_LUA_DECLARE(int) lua_db_acquire(lua_State *L)
+int lua_db_acquire(lua_State *L)
 {
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
     const char      *type;

diff --git a/modules/lua/lua_dbd.h b/modules/lua/lua_dbd.h
index 6f74efd0bd0e5977ec4a7b469718081109c481b2..566204b15cac30c64b55218414a3998dc8e1abf5 100644 (file)
--- a/modules/lua/lua_dbd.h
+++ b/modules/lua/lua_dbd.h
@@ -50,7 +50,7 @@ typedef struct {
     lua_db_handle           *db;
 } lua_db_prepared_statement;
 
-AP_LUA_DECLARE(int) lua_db_acquire(lua_State* L);
+int lua_db_acquire(lua_State* L);
 int lua_db_escape(lua_State* L);
 int lua_db_close(lua_State* L);
 int lua_db_prepare(lua_State* L);

diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index 247c390b73bb3834234223d97507f5451fd2e336..e1b028e49037770ab6e5129a488ad26f5aafe645 100644 (file)
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -1874,7 +1874,7 @@ static req_fun_t *makefun(const void *fun, int type, apr_pool_t *pool)
     return rft;
 }
 
-AP_LUA_DECLARE(void) ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p)
+void ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p)
 {
 
     apr_hash_t *dispatch = apr_hash_make(p);
@@ -2121,7 +2121,7 @@ AP_LUA_DECLARE(void) ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p)
 
 }
 
-AP_LUA_DECLARE(void) ap_lua_push_connection(lua_State *L, conn_rec *c)
+void ap_lua_push_connection(lua_State *L, conn_rec *c)
 {
     lua_boxpointer(L, c);
     luaL_getmetatable(L, "Apache2.Connection");
@@ -2138,7 +2138,7 @@ AP_LUA_DECLARE(void) ap_lua_push_connection(lua_State *L, conn_rec *c)
 }
 
 
-AP_LUA_DECLARE(void) ap_lua_push_server(lua_State *L, server_rec *s)
+void ap_lua_push_server(lua_State *L, server_rec *s)
 {
     lua_boxpointer(L, s);
     luaL_getmetatable(L, "Apache2.Server");
@@ -2151,7 +2151,7 @@ AP_LUA_DECLARE(void) ap_lua_push_server(lua_State *L, server_rec *s)
     lua_pop(L, 1);
 }
 
-AP_LUA_DECLARE(void) ap_lua_push_request(lua_State *L, request_rec *r)
+void ap_lua_push_request(lua_State *L, request_rec *r)
 {
     lua_boxpointer(L, r);
     luaL_getmetatable(L, "Apache2.Request");

diff --git a/modules/lua/lua_request.h b/modules/lua/lua_request.h
index 5eb6745cb8e2d8ce57f74fad604b36e2a4384995..b5ed3e5fc098544dd9a97d2158abb21732092f2b 100644 (file)
--- a/modules/lua/lua_request.h
+++ b/modules/lua/lua_request.h
@@ -21,10 +21,10 @@
 #include "mod_lua.h"
 #include "util_varbuf.h"
 
-AP_LUA_DECLARE(void) ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p);
-AP_LUA_DECLARE(void) ap_lua_push_connection(lua_State *L, conn_rec *r);
-AP_LUA_DECLARE(void) ap_lua_push_server(lua_State *L, server_rec *r);
-AP_LUA_DECLARE(void) ap_lua_push_request(lua_State *L, request_rec *r);
+void ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p);
+void ap_lua_push_connection(lua_State *L, conn_rec *r);
+void ap_lua_push_server(lua_State *L, server_rec *r);
+void ap_lua_push_request(lua_State *L, request_rec *r);
 
 #define APL_REQ_FUNTYPE_STRING      1
 #define APL_REQ_FUNTYPE_INT         2

diff --git a/modules/lua/lua_vmprep.c b/modules/lua/lua_vmprep.c
index 67b3f04dbf0103d5928534327387597e0be97bf4..b0eb01c432791adee7b30bcef825ae07d8d93e40 100644 (file)
--- a/modules/lua/lua_vmprep.c
+++ b/modules/lua/lua_vmprep.c
@@ -120,7 +120,7 @@ static void pstack_dump(lua_State *L, apr_pool_t *r, int level,
 
 #define makeintegerfield(L, n) lua_pushinteger(L, n); lua_setfield(L, -2, #n)
 
-AP_LUA_DECLARE(void) ap_lua_load_apache2_lmodule(lua_State *L)
+void ap_lua_load_apache2_lmodule(lua_State *L)
 {
     lua_getglobal(L, "package");
     lua_getfield(L, -1, "loaded");
@@ -405,7 +405,7 @@ static apr_status_t server_vm_construct(lua_State **resource, void *params, apr_
  * Function used to create a lua_State instance bound into the web
  * server in the appropriate scope.
  */
-AP_LUA_DECLARE(lua_State*)ap_lua_get_lua_state(apr_pool_t *lifecycle_pool,
+lua_State *ap_lua_get_lua_state(apr_pool_t *lifecycle_pool,
                                                ap_lua_vm_spec *spec, request_rec* r)
 {
     lua_State *L = NULL;

diff --git a/modules/lua/lua_vmprep.h b/modules/lua/lua_vmprep.h
index c7e90f667e9b8400bbe85d7a66dd4a4d220842d3..e46ac9b884f93acf92b5b09fc483e36297820aca 100644 (file)
--- a/modules/lua/lua_vmprep.h
+++ b/modules/lua/lua_vmprep.h
@@ -118,7 +118,7 @@ typedef struct {
 /**
  * Fake out addition of the "apache2" module
  */
-AP_LUA_DECLARE(void) ap_lua_load_apache2_lmodule(lua_State *L);
+void ap_lua_load_apache2_lmodule(lua_State *L);
 
 /*
  * alternate means of getting lua_State (preferred eventually)
@@ -132,7 +132,7 @@ AP_LUA_DECLARE(void) ap_lua_load_apache2_lmodule(lua_State *L);
  * @cb callback for vm initialization called *before* the file is opened
  * @ctx a baton passed to cb
  */
-AP_LUA_DECLARE(lua_State*) ap_lua_get_lua_state(apr_pool_t *lifecycle_pool,
+lua_State *ap_lua_get_lua_state(apr_pool_t *lifecycle_pool,
                                                 ap_lua_vm_spec *spec, request_rec* r);
 
 #if APR_HAS_THREADS || defined(DOXYGEN)