Merge branch 'master' of git://github.com/keplerproject/luafilesystem

3 files changed, 10 insertions, 4 deletions

diff --git a/src/lfs.c b/src/lfs.c
index 4cb5875..020267d 100644
--- a/src/lfs.c
+++ b/src/lfs.c
@@ -292,7 +292,7 @@ static int lfs_lock_dir(lua_State *L) {
   return 1;
 }
 static int lfs_unlock_dir(lua_State *L) {
-  lfs_Lock *lock = luaL_checkudata(L, 1, LOCK_METATABLE);
+  lfs_Lock *lock = (lfs_Lock *)luaL_checkudata(L, 1, LOCK_METATABLE);
   if(lock->fd != INVALID_HANDLE_VALUE) {    
     CloseHandle(lock->fd);
     lock->fd=INVALID_HANDLE_VALUE;
@@ -325,7 +325,7 @@ static int lfs_lock_dir(lua_State *L) {
   return 1;
 }
 static int lfs_unlock_dir(lua_State *L) {
-  lfs_Lock *lock = luaL_checkudata(L, 1, LOCK_METATABLE);
+  lfs_Lock *lock = (lfs_Lock *)luaL_checkudata(L, 1, LOCK_METATABLE);
   if(lock->ln) {
     unlink(lock->ln);
     free(lock->ln);
diff --git a/src/lfs.def b/src/lfs.def
index 7aa7a35..8a36d41 100644
--- a/src/lfs.def
+++ b/src/lfs.def
@@ -1,5 +1,4 @@
 LIBRARY lfs.dll

-DESCRIPTION "LuaFileSystem"

-VERSION 1.5.0

+VERSION 1.6

 EXPORTS

 luaopen_lfs

diff --git a/src/lfs.h b/src/lfs.h
index ddd454d..02ceafb 100644
--- a/src/lfs.h
+++ b/src/lfs.h
@@ -21,5 +21,12 @@
 #define fileno(f) (_fileno(f))
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 int luaopen_lfs (lua_State *L);
+
+#ifdef __cplusplus
+}
+#endif