Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8801898BC for ; Wed, 1 Feb 2012 09:52:32 +0000 (UTC) Received: (qmail 97571 invoked by uid 500); 1 Feb 2012 09:52:30 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 97352 invoked by uid 500); 1 Feb 2012 09:52:23 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 97339 invoked by uid 99); 1 Feb 2012 09:52:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2012 09:52:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2012 09:52:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 45B092388865; Wed, 1 Feb 2012 09:52:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1239030 - /httpd/httpd/trunk/modules/lua/mod_lua.h Date: Wed, 01 Feb 2012 09:52:00 -0000 To: cvs@httpd.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120201095200.45B092388865@eris.apache.org> Author: rjung Date: Wed Feb 1 09:51:59 2012 New Revision: 1239030 URL: http://svn.apache.org/viewvc?rev=1239030&view=rev Log: Remove luaL_reg macro definition no longer needed and simplify lua_load compatibility macro. Note that in order to successfully compile with Lua 5.2.0 we still need to add LUA_COMPAT_ALL to CPPFLAGS. Detection in config.m4 is still missing. Modified: httpd/httpd/trunk/modules/lua/mod_lua.h Modified: httpd/httpd/trunk/modules/lua/mod_lua.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.h?rev=1239030&r1=1239029&r2=1239030&view=diff ============================================================================== --- httpd/httpd/trunk/modules/lua/mod_lua.h (original) +++ httpd/httpd/trunk/modules/lua/mod_lua.h Wed Feb 1 09:51:59 2012 @@ -46,9 +46,7 @@ #if LUA_VERSION_NUM > 501 /* Load mode for lua_load() */ -#define DFLT_LUA_LOAD_MODE "bt" -#define lua_load(a,b,c,d) lua_load(a,b,c,d,DFLT_LUA_LOAD_MODE) -#define luaL_reg luaL_Reg +#define lua_load(a,b,c,d) lua_load(a,b,c,d,NULL) #endif /* Create a set of AP_LUA_DECLARE(type), AP_LUA_DECLARE_NONSTD(type) and