From 60e2bf1f47e42cb1a78ef818b56ba3778b6af47e Mon Sep 17 00:00:00 2001 From: Daniel Gruno Date: Fri, 11 Jan 2013 08:13:28 +0000 Subject: [PATCH] Since functions are now pushed solely in lua_dbd.c, there's no need to declare them in lua_dbd.h Hopefully, this solves the Windows compiler issues. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1431930 13f79535-47bb-0310-9956-ffa450edef68 --- modules/lua/lua_dbd.c | 16 ++++++++-------- modules/lua/lua_dbd.h | 11 +---------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/modules/lua/lua_dbd.c b/modules/lua/lua_dbd.c index 61ccac5a9b..0bd1d5e881 100644 --- a/modules/lua/lua_dbd.c +++ b/modules/lua/lua_dbd.c @@ -56,7 +56,7 @@ static lua_db_result_set *lua_get_result_set(lua_State *L) db:close(): Closes an open database connection. ============================================================================= */ -AP_LUA_DECLARE(int) lua_db_close(lua_State *L) +static int lua_db_close(lua_State *L) { /*~~~~~~~~~~~~~~~~~~~~*/ lua_db_handle *db; @@ -91,7 +91,7 @@ AP_LUA_DECLARE(int) lua_db_close(lua_State *L) db:__gc(): Garbage collecting function. ============================================================================= */ -AP_LUA_DECLARE(int) lua_db_gc(lua_State *L) +static int lua_db_gc(lua_State *L) { /*~~~~~~~~~~~~~~~~*/ lua_db_handle *db; @@ -122,7 +122,7 @@ AP_LUA_DECLARE(int) lua_db_gc(lua_State *L) db:active(): Returns true if the connection to the db is still active. ============================================================================= */ -AP_LUA_DECLARE(int) lua_db_active(lua_State *L) +static int lua_db_active(lua_State *L) { /*~~~~~~~~~~~~~~~~~~~~*/ lua_db_handle *db = 0; @@ -149,7 +149,7 @@ AP_LUA_DECLARE(int) lua_db_active(lua_State *L) first parameter and the error message as the second. ============================================================================= */ -AP_LUA_DECLARE(int) lua_db_query(lua_State *L) +static int lua_db_query(lua_State *L) { /*~~~~~~~~~~~~~~~~~~~~~~~*/ lua_db_handle *db = 0; @@ -190,7 +190,7 @@ AP_LUA_DECLARE(int) lua_db_query(lua_State *L) db:escape(string): Escapes a string for safe use in the given database type. ============================================================================= */ -AP_LUA_DECLARE(int) lua_db_escape(lua_State *L) +static int lua_db_escape(lua_State *L) { /*~~~~~~~~~~~~~~~~~~~~~*/ lua_db_handle *db = 0; @@ -287,7 +287,7 @@ static int lua_db_get_row(lua_State *L) returns nil as the first parameter and the error message as the second. ============================================================================= */ -AP_LUA_DECLARE(int) lua_db_select(lua_State *L) +static int lua_db_select(lua_State *L) { /*~~~~~~~~~~~~~~~~~~~~~~~*/ lua_db_handle *db = 0; @@ -522,7 +522,7 @@ static int lua_db_prepared_query(lua_State *L) Returns a table with a :query and :select function, same as the db funcs. ============================================================================= */ -AP_LUA_DECLARE(int) lua_db_prepare(lua_State* L) +static int lua_db_prepare(lua_State* L) { /*~~~~~~~~~~~~~~~~~~~~~~~~~~*/ lua_db_handle *db = 0; @@ -595,7 +595,7 @@ AP_LUA_DECLARE(int) lua_db_prepare(lua_State* L) DBDPrepareSQL. ============================================================================= */ -AP_LUA_DECLARE(int) lua_db_prepared(lua_State* L) +static int lua_db_prepared(lua_State* L) { /*~~~~~~~~~~~~~~~~~~~~~~~~~~*/ lua_db_handle *db = 0; diff --git a/modules/lua/lua_dbd.h b/modules/lua/lua_dbd.h index 4c647cc3a5..5cd2a7dd2b 100644 --- a/modules/lua/lua_dbd.h +++ b/modules/lua/lua_dbd.h @@ -50,16 +50,7 @@ typedef struct { lua_db_handle *db; } lua_db_prepared_statement; - -AP_LUA_DECLARE(int) lua_db_close(lua_State *L); -AP_LUA_DECLARE(int) lua_db_gc(lua_State *L); -AP_LUA_DECLARE(int) lua_db_active(lua_State *L); -AP_LUA_DECLARE(int) lua_db_query(lua_State *L); -AP_LUA_DECLARE(int) lua_db_escape(lua_State *L); -AP_LUA_DECLARE(int) lua_db_select(lua_State *L); -AP_LUA_DECLARE(int) lua_db_prepare(lua_State* L); -AP_LUA_DECLARE(int) lua_db_prepared(lua_State* L); AP_LUA_DECLARE(int) lua_db_acquire(lua_State* L); - + #endif /* !_LUA_DBD_H_ */ -- 2.40.0