[med-svn] [cnrun] 04/06: additional lua-related fixes, possibly not really necessary

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch master
in repository cnrun.

commit b5e02829781c384966d8ba3498bf51c564fccb0d
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue Nov 25 00:34:23 2014 +0200

    additional lua-related fixes, possibly not really necessary
---
 upstream/src/lua-cnrun/Makefile.am | 1 +
 upstream/src/lua-cnrun/commands.cc | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/upstream/src/lua-cnrun/Makefile.am b/upstream/src/lua-cnrun/Makefile.am
index eca1f01..8868611 100644
--- a/upstream/src/lua-cnrun/Makefile.am
+++ b/upstream/src/lua-cnrun/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/src/Common.mk
+
 AM_CXXFLAGS += $(LUA_INCLUDE)
 
 pkglib_LTLIBRARIES = \
diff --git a/upstream/src/lua-cnrun/commands.cc b/upstream/src/lua-cnrun/commands.cc
index c29edac..91bae5c 100644
--- a/upstream/src/lua-cnrun/commands.cc
+++ b/upstream/src/lua-cnrun/commands.cc
@@ -1018,12 +1018,12 @@ extern "C" {
 
 int luaopen_cnrun( lua_State *L)
 {
-#ifdef HAVE_LUA_51
-        printf( "register cnrun\n");
-        luaL_register(L, "cnlib", cnlib);
-#else  // this must be 5.2
+#ifdef HAVE_LUA_52
         printf( "newlib cnrun\n");
         luaL_newlib(L, cnlib);
+#else  // this must be 5.1
+        printf( "register cnrun\n");
+        luaL_register(L, "cnlib", cnlib);
 #endif
         return 1;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cnrun.git