summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anylike.org>2016-02-25 23:24:11 +0100
committerChristian Pointner <equinox@anylike.org>2016-02-25 23:24:11 +0100
commitdda72105b0b68971f5a9bb8fd77a68eda296c7dd (patch)
treeaba83531eb68e7803f70d1b6409aa81c7f431f10 /src
parentadded git ignore (diff)
updated info after moving to GITHEADmaster
Diffstat (limited to 'src')
-rwxr-xr-xsrc/configure10
-rw-r--r--src/l_log.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/configure b/src/configure
index 1435f5f..1a29ddc 100755
--- a/src/configure
+++ b/src/configure
@@ -307,11 +307,11 @@ if [ "$TARGET" != "mingw" ]; then
echo "not installing example files"
fi
- VERSION=`cat ../version`
- if which svn >/dev/null; then
- SVN_REV=`svn info 2> /dev/null | grep "^Revision: " | awk '{print($2)}'`
- if [ -n "$SVN_REV" ]; then
- VERSION="$VERSION (svn$SVN_REV)"
+VERSION=`cat ../version`
+if which git >/dev/null; then
+ GIT_HASH=`git rev-parse HEAD 2> /dev/null`
+ if [ -n "$GIT_HASH" ]; then
+ VERSION="$VERSION (git $GIT_HASH)"
fi
fi
diff --git a/src/l_log.c b/src/l_log.c
index 37e725e..5db304d 100644
--- a/src/l_log.c
+++ b/src/l_log.c
@@ -84,7 +84,7 @@ static int l_log_printf(lua_State *L)
lua_call(L, numargs - 1, 1);
}
- log_prio_t prio = luaL_checkint(L,1);
+ log_prio_t prio = luaL_checkinteger(L,1);
log_printf(prio, "%s", luaL_checkstring(L, 2));
return 0;
}