From 42e06c6330f67d8643a09ec853648ef4dc9385de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 14 Aug 2011 00:09:59 +0200
Subject: [PATCH] Fix lua. It had bad linkage with the c++ wrapper.

---
 lua/CMakeLists.txt    | 20 ++++++++++----------
 lua/include/luaconf.h | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt
index 7203ae666..2a1ccd8df 100644
--- a/lua/CMakeLists.txt
+++ b/lua/CMakeLists.txt
@@ -16,34 +16,34 @@ ENDIF()
 # Build Libraries
 SET (SRC_LIBLUA
 src/lapi.c
+src/lauxlib.c
+src/lbaselib.c
 src/lcode.c
+src/ldblib.c
 src/ldebug.c
 src/ldo.c
 src/ldump.c
 src/lfunc.c
 src/lgc.c
+src/linit.c
+src/liolib.c
 src/llex.c
+src/lmathlib.c
 src/lmem.c
+src/loadlib.c
 src/lobject.c
 src/lopcodes.c
+src/loslib.c
 src/lparser.c
 src/lstate.c
 src/lstring.c
+src/lstrlib.c
 src/ltable.c
+src/ltablib.c
 src/ltm.c
 src/lundump.c
 src/lvm.c
 src/lzio.c
-src/lauxlib.c
-src/lbaselib.c
-src/ldblib.c
-src/liolib.c
-src/lmathlib.c
-src/loslib.c
-src/ltablib.c
-src/lstrlib.c
-src/loadlib.c
-src/linit.c
 )
 
 ADD_LIBRARY ( lua ${SRC_LIBLUA} )
diff --git a/lua/include/luaconf.h b/lua/include/luaconf.h
index e2cb26163..ba9e833bb 100644
--- a/lua/include/luaconf.h
+++ b/lua/include/luaconf.h
@@ -152,17 +152,17 @@
 ** LUA_BUILD_AS_DLL to get it).
 */
 #if defined(LUA_BUILD_AS_DLL)
-
-#if defined(LUA_CORE) || defined(LUA_LIB)
-#define LUA_API __declspec(dllexport)
-#else
-#define LUA_API __declspec(dllimport)
-#endif
-
+    #if defined(LUA_CORE) || defined(LUA_LIB)
+        #define LUA_API __declspec(dllexport)
+    #else
+        #define LUA_API __declspec(dllimport)
+    #endif
 #else
-
-#define LUA_API		extern
-
+    #ifdef __cplusplus
+        #define LUA_API extern "C"
+    #else
+        #define LUA_API extern
+    #endif
 #endif
 
 /* more often than not the libs go together with the core */