From: Paul Querna <pquerna@apache.org>
Date: Sun, 21 Dec 2008 21:27:01 +0000 (+0000)
Subject: Rename all files in mod_lua to have a lua_ prefix, as things like 'config.h' are... 
X-Git-Tag: 2.3.1~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3948867f51aa4bd9fca398f70d7615ecb36ffe3c;p=apache

Rename all files in mod_lua to have a lua_ prefix, as things like 'config.h' are way to generic and will often conflict with other include files.


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

diff --git a/modules/lua/config.m4 b/modules/lua/config.m4
index 035f34b1c8..5d123948b7 100644
--- a/modules/lua/config.m4
+++ b/modules/lua/config.m4
@@ -92,7 +92,7 @@ else
 fi 
 ])
 
-lua_objects="apr_lua.lo config.lo mod_lua.lo request.lo vmprep.lo"
+lua_objects="lua_apr.lo lua_config.lo mod_lua.lo lua_request.lo lua_vmprep.lo"
 
 APACHE_MODULE(lua, Apache Lua Framework, $lua_objects, , no,
 [
diff --git a/modules/lua/apr_lua.c b/modules/lua/lua_apr.c
similarity index 98%
rename from modules/lua/apr_lua.c
rename to modules/lua/lua_apr.c
index d248fe8822..655156ed1e 100644
--- a/modules/lua/apr_lua.c
+++ b/modules/lua/lua_apr.c
@@ -4,7 +4,7 @@
 #include "lua.h"
 #include "lauxlib.h"
 #include "lualib.h"
-#include "apr_lua.h"
+#include "lua_apr.h"
 
 /**
  * make a userdata out of a C pointer, and vice versa
diff --git a/modules/lua/apr_lua.h b/modules/lua/lua_apr.h
similarity index 72%
rename from modules/lua/apr_lua.h
rename to modules/lua/lua_apr.h
index 07862778af..b7bdf53425 100644
--- a/modules/lua/apr_lua.h
+++ b/modules/lua/lua_apr.h
@@ -1,8 +1,8 @@
-#ifndef _APR_LUA_H_
-#define _APR_LUA_H_
+#ifndef _LUA_APR_H_
+#define _LUA_APR_H_
 
 int apr_lua_init(lua_State *L, apr_pool_t *p);
 apr_table_t* check_apr_table(lua_State* L, int index);
 void apl_push_apr_table(lua_State* L, const char *name, apr_table_t *t);
 
-#endif
+#endif /* !_LUA_APR_H_ */
diff --git a/modules/lua/config.c b/modules/lua/lua_config.c
similarity index 99%
rename from modules/lua/config.c
rename to modules/lua/lua_config.c
index c4e1d7eab0..7848b06a47 100644
--- a/modules/lua/config.c
+++ b/modules/lua/lua_config.c
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
  
-#include "config.h"
-#include "vmprep.h"
+#include "lua_config.h"
+#include "lua_vmprep.h"
 
 static apw_dir_cfg* check_dir_config(lua_State* L, int index) {
     luaL_checkudata(L, index, "Apache2.DirConfig");
diff --git a/modules/lua/config.h b/modules/lua/lua_config.h
similarity index 100%
rename from modules/lua/config.h
rename to modules/lua/lua_config.h
diff --git a/modules/lua/request.c b/modules/lua/lua_request.c
similarity index 99%
rename from modules/lua/request.c
rename to modules/lua/lua_request.c
index ed6175629f..7b555f9b45 100644
--- a/modules/lua/request.c
+++ b/modules/lua/lua_request.c
@@ -17,7 +17,7 @@
 
 #include "mod_lua.h"
 #include "util_script.h"
-#include "apr_lua.h"
+#include "lua_apr.h"
 
 typedef char* (*req_field_string_f) (request_rec* r);
 typedef int (*req_field_int_f) (request_rec* r);
diff --git a/modules/lua/request.h b/modules/lua/lua_request.h
similarity index 93%
rename from modules/lua/request.h
rename to modules/lua/lua_request.h
index e4f867c478..a5ecb44a26 100644
--- a/modules/lua/request.h
+++ b/modules/lua/lua_request.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef REQUEST_H
-#define REQUEST_H
+#ifndef _LUA_REQUEST_H_
+#define _LUA_REQUEST_H_
 
 APR_DECLARE(void) apl_push_request(lua_State* L, request_rec* r);
 APR_DECLARE(void) apl_load_request_lmodule(lua_State *L, apr_pool_t *p);
@@ -33,5 +33,5 @@ typedef struct {
 } req_fun_t;
 
 
-#endif
+#endif /* !_LUA_REQUEST_H_ */
 
diff --git a/modules/lua/vmprep.c b/modules/lua/lua_vmprep.c
similarity index 99%
rename from modules/lua/vmprep.c
rename to modules/lua/lua_vmprep.c
index bbe288c72a..6be8fab11b 100644
--- a/modules/lua/vmprep.c
+++ b/modules/lua/lua_vmprep.c
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "vmprep.h"
 #include "mod_lua.h"
 #include "http_log.h"
 #include "apr_reslist.h"
 #include "apr_uuid.h"
-#include "config.h"
+#include "lua_config.h"
 #include "apr_file_info.h"
 
 /* forward dec'l from this file */
diff --git a/modules/lua/vmprep.h b/modules/lua/lua_vmprep.h
similarity index 100%
rename from modules/lua/vmprep.h
rename to modules/lua/lua_vmprep.h
diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c
index bde119191e..b7b77d6b11 100644
--- a/modules/lua/mod_lua.c
+++ b/modules/lua/mod_lua.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "apr_lua.h"
+#include "lua_apr.h"
 
 APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(apl, AP_LUA, int, lua_open,
                                     (lua_State *L, apr_pool_t *p),
diff --git a/modules/lua/mod_lua.h b/modules/lua/mod_lua.h
index c718544eff..0b656faac6 100644
--- a/modules/lua/mod_lua.h
+++ b/modules/lua/mod_lua.h
@@ -44,8 +44,8 @@
 #include "lauxlib.h"
 #include "lualib.h"
 
-#include "request.h"
-#include "vmprep.h"
+#include "lua_request.h"
+#include "lua_vmprep.h"
 
 
 /**