httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r728508 - /httpd/httpd/trunk/modules/lua/
Date Sun, 21 Dec 2008 21:27:02 GMT
Author: pquerna
Date: Sun Dec 21 13:27:01 2008
New Revision: 728508

URL: http://svn.apache.org/viewvc?rev=728508&view=rev
Log:
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.

Added:
    httpd/httpd/trunk/modules/lua/lua_apr.c   (contents, props changed)
      - copied, changed from r728506, httpd/httpd/trunk/modules/lua/apr_lua.c
    httpd/httpd/trunk/modules/lua/lua_apr.h   (contents, props changed)
      - copied, changed from r728506, httpd/httpd/trunk/modules/lua/apr_lua.h
    httpd/httpd/trunk/modules/lua/lua_config.c   (contents, props changed)
      - copied, changed from r728494, httpd/httpd/trunk/modules/lua/config.c
    httpd/httpd/trunk/modules/lua/lua_config.h   (props changed)
      - copied unchanged from r728506, httpd/httpd/trunk/modules/lua/config.h
    httpd/httpd/trunk/modules/lua/lua_request.c   (contents, props changed)
      - copied, changed from r728506, httpd/httpd/trunk/modules/lua/request.c
    httpd/httpd/trunk/modules/lua/lua_request.h   (contents, props changed)
      - copied, changed from r728506, httpd/httpd/trunk/modules/lua/request.h
    httpd/httpd/trunk/modules/lua/lua_vmprep.c   (contents, props changed)
      - copied, changed from r728506, httpd/httpd/trunk/modules/lua/vmprep.c
    httpd/httpd/trunk/modules/lua/lua_vmprep.h   (props changed)
      - copied unchanged from r728506, httpd/httpd/trunk/modules/lua/vmprep.h
Removed:
    httpd/httpd/trunk/modules/lua/apr_lua.c
    httpd/httpd/trunk/modules/lua/apr_lua.h
    httpd/httpd/trunk/modules/lua/config.c
    httpd/httpd/trunk/modules/lua/config.h
    httpd/httpd/trunk/modules/lua/request.c
    httpd/httpd/trunk/modules/lua/request.h
    httpd/httpd/trunk/modules/lua/vmprep.c
    httpd/httpd/trunk/modules/lua/vmprep.h
Modified:
    httpd/httpd/trunk/modules/lua/config.m4
    httpd/httpd/trunk/modules/lua/mod_lua.c
    httpd/httpd/trunk/modules/lua/mod_lua.h

Modified: httpd/httpd/trunk/modules/lua/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/config.m4?rev=728508&r1=728507&r2=728508&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/config.m4 (original)
+++ httpd/httpd/trunk/modules/lua/config.m4 Sun Dec 21 13:27:01 2008
@@ -92,7 +92,7 @@
 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,
 [

Copied: httpd/httpd/trunk/modules/lua/lua_apr.c (from r728506, httpd/httpd/trunk/modules/lua/apr_lua.c)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_apr.c?p2=httpd/httpd/trunk/modules/lua/lua_apr.c&p1=httpd/httpd/trunk/modules/lua/apr_lua.c&r1=728506&r2=728508&rev=728508&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/apr_lua.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_apr.c Sun Dec 21 13:27:01 2008
@@ -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

Propchange: httpd/httpd/trunk/modules/lua/lua_apr.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/lua/lua_apr.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: httpd/httpd/trunk/modules/lua/lua_apr.h (from r728506, httpd/httpd/trunk/modules/lua/apr_lua.h)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_apr.h?p2=httpd/httpd/trunk/modules/lua/lua_apr.h&p1=httpd/httpd/trunk/modules/lua/apr_lua.h&r1=728506&r2=728508&rev=728508&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/apr_lua.h (original)
+++ httpd/httpd/trunk/modules/lua/lua_apr.h Sun Dec 21 13:27:01 2008
@@ -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_ */

Propchange: httpd/httpd/trunk/modules/lua/lua_apr.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/lua/lua_apr.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: httpd/httpd/trunk/modules/lua/lua_config.c (from r728494, httpd/httpd/trunk/modules/lua/config.c)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_config.c?p2=httpd/httpd/trunk/modules/lua/lua_config.c&p1=httpd/httpd/trunk/modules/lua/config.c&r1=728494&r2=728508&rev=728508&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/config.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_config.c Sun Dec 21 13:27:01 2008
@@ -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");

Propchange: httpd/httpd/trunk/modules/lua/lua_config.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/lua/lua_config.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Dec 21 13:27:01 2008
@@ -0,0 +1 @@
+/httpd/httpd/branches/wombat-integration/modules/wombat/config.c:723609-723841

Propchange: httpd/httpd/trunk/modules/lua/lua_config.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/lua/lua_config.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: httpd/httpd/trunk/modules/lua/lua_request.c (from r728506, httpd/httpd/trunk/modules/lua/request.c)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_request.c?p2=httpd/httpd/trunk/modules/lua/lua_request.c&p1=httpd/httpd/trunk/modules/lua/request.c&r1=728506&r2=728508&rev=728508&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/request.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_request.c Sun Dec 21 13:27:01 2008
@@ -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);

Propchange: httpd/httpd/trunk/modules/lua/lua_request.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/lua/lua_request.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: httpd/httpd/trunk/modules/lua/lua_request.h (from r728506, httpd/httpd/trunk/modules/lua/request.h)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_request.h?p2=httpd/httpd/trunk/modules/lua/lua_request.h&p1=httpd/httpd/trunk/modules/lua/request.h&r1=728506&r2=728508&rev=728508&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/request.h (original)
+++ httpd/httpd/trunk/modules/lua/lua_request.h Sun Dec 21 13:27:01 2008
@@ -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 @@
 } req_fun_t;
 
 
-#endif
+#endif /* !_LUA_REQUEST_H_ */
 

Propchange: httpd/httpd/trunk/modules/lua/lua_request.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/lua/lua_request.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: httpd/httpd/trunk/modules/lua/lua_vmprep.c (from r728506, httpd/httpd/trunk/modules/lua/vmprep.c)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_vmprep.c?p2=httpd/httpd/trunk/modules/lua/lua_vmprep.c&p1=httpd/httpd/trunk/modules/lua/vmprep.c&r1=728506&r2=728508&rev=728508&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/vmprep.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_vmprep.c Sun Dec 21 13:27:01 2008
@@ -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 */

Propchange: httpd/httpd/trunk/modules/lua/lua_vmprep.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/lua/lua_vmprep.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: httpd/httpd/trunk/modules/lua/lua_vmprep.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/lua/lua_vmprep.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: httpd/httpd/trunk/modules/lua/mod_lua.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.c?rev=728508&r1=728507&r2=728508&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/mod_lua.c (original)
+++ httpd/httpd/trunk/modules/lua/mod_lua.c Sun Dec 21 13:27:01 2008
@@ -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),

Modified: httpd/httpd/trunk/modules/lua/mod_lua.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.h?rev=728508&r1=728507&r2=728508&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/mod_lua.h (original)
+++ httpd/httpd/trunk/modules/lua/mod_lua.h Sun Dec 21 13:27:01 2008
@@ -44,8 +44,8 @@
 #include "lauxlib.h"
 #include "lualib.h"
 
-#include "request.h"
-#include "vmprep.h"
+#include "lua_request.h"
+#include "lua_vmprep.h"
 
 
 /**



Mime
View raw message