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

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,
 [

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

modules/lua/lua_apr.h

@@ -1,8 +1,8 @@
-#ifndef _APR_LUA_H_
+#ifndef _LUA_APR_H_
-#define _APR_LUA_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_ */

modules/lua/lua_config.c

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
  
-#include "config.h"
+#include "lua_config.h"
-#include "vmprep.h"
+#include "lua_vmprep.h"
 
 static apw_dir_cfg* check_dir_config(lua_State* L, int index) {
     luaL_checkudata(L, index, "Apache2.DirConfig");

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);

modules/lua/lua_request.h

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef REQUEST_H
+#ifndef _LUA_REQUEST_H_
-#define 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_ */
 

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 */

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),

modules/lua/mod_lua.h

@@ -44,8 +44,8 @@
 #include "lauxlib.h"
 #include "lualib.h"
 
-#include "request.h"
+#include "lua_request.h"
-#include "vmprep.h"
+#include "lua_vmprep.h"
 
 
 /**