commit 85c1461422a8a97a25ee385793def9c89e70739c
parent 5ba556d27a0114d43941335fab4968c51dd1cef5
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Sun, 25 Jul 2010 12:02:17 -0300
new macros LUA_VERSION_{MAJOR/MINOR/RELEASE}
Diffstat:
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/lua.h b/lua.h
@@ -1,5 +1,5 @@
/*
-** $Id: lua.h,v 1.270 2010/05/12 14:09:20 roberto Exp roberto $
+** $Id: lua.h,v 1.271 2010/07/02 12:01:53 roberto Exp roberto $
** Lua - A Scripting Language
** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
** See Copyright Notice at the end of this file
@@ -16,8 +16,12 @@
#include "luaconf.h"
-#define LUA_VERSION "Lua 5.2"
-#define LUA_RELEASE "Lua 5.2.0"
+#define LUA_VERSION_MAJOR "5"
+#define LUA_VERSION_MINOR "2"
+#define LUA_VERSION_RELEASE "0"
+
+#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
+#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
#define LUA_VERSION_NUM 502
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2010 Lua.org, PUC-Rio"
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
diff --git a/luaconf.h b/luaconf.h
@@ -1,5 +1,5 @@
/*
-** $Id: luaconf.h,v 1.139 2010/05/28 14:27:07 roberto Exp roberto $
+** $Id: luaconf.h,v 1.140 2010/07/18 14:34:45 roberto Exp roberto $
** Configuration file for Lua
** See Copyright Notice in lua.h
*/
@@ -90,9 +90,11 @@
LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll"
#else /* }{ */
+
+#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
#define LUA_ROOT "/usr/local/"
-#define LUA_LDIR LUA_ROOT "share/lua/5.2/"
-#define LUA_CDIR LUA_ROOT "lib/lua/5.2/"
+#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
+#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
#define LUA_PATH_DEFAULT \
LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" "./?.lua"