You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/07/28 16:37:54 UTC
svn commit: r1366689 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/lua/mod_lua.h
Author: jim
Date: Sat Jul 28 14:37:54 2012
New Revision: 1366689
URL: http://svn.apache.org/viewvc?rev=1366689&view=rev
Log:
Merge r1366621 from trunk:
LUA_COMPAT_ALL should be defined _before_ including lua headers
Submitted by: humbedooh
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/lua/mod_lua.h
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1366621
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1366689&r1=1366688&r2=1366689&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Jul 28 14:37:54 2012
@@ -101,11 +101,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.4.x patch: trunk patch works
+1: trawick, covener, jim
- * mod_lua: Move LUA_COMPAT_ALL into the right position, before lua headers.
- trunk patch: http://svn.apache.org/viewvc?rev=1366621&view=rev
- 2.4.x patch: trunk patch works.
- +1: humbedooh, covener, jim
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/lua/mod_lua.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/lua/mod_lua.h?rev=1366689&r1=1366688&r2=1366689&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/lua/mod_lua.h (original)
+++ httpd/httpd/branches/2.4.x/modules/lua/mod_lua.h Sat Jul 28 14:37:54 2012
@@ -40,12 +40,13 @@
#include "apr_time.h"
#include "apr_hooks.h"
+/* Allow for Lua 5.2 backwards compatibility */
+#define LUA_COMPAT_ALL
+
#include "lua.h"
#include "lauxlib.h"
#include "lualib.h"
-/* Allow for Lua 5.2 backwards compatibility */
-#define LUA_COMPAT_ALL
#if LUA_VERSION_NUM > 501
/* Load mode for lua_load() */
#define lua_load(a,b,c,d) lua_load(a,b,c,d,NULL)