added extern "C" such that qlua works with vanilla lua

14 files changed, 39 insertions, 2 deletions

diff --git a/packages/qtcore/qtcore.h b/packages/qtcore/qtcore.h
index 6bbd604..37d1a53 100644
--- a/packages/qtcore/qtcore.h
+++ b/packages/qtcore/qtcore.h
@@ -3,8 +3,10 @@
 #ifndef QTCORE_H
 #define QTCORE_H
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 #include "qtluaengine.h"
 #include "qtluautils.h"
 
@@ -19,6 +21,8 @@
 # define QTCORE_API /**/
 #endif
 
+#define LUA_EXTERNC extern "C"
+
 LUA_EXTERNC QTCORE_API int luaopen_libqtcore(lua_State *L);
 
 
diff --git a/packages/qtgui/qtgui.h b/packages/qtgui/qtgui.h
index e925e39..572df1c 100644
--- a/packages/qtgui/qtgui.h
+++ b/packages/qtgui/qtgui.h
@@ -3,8 +3,10 @@
 #ifndef QTGUI_H
 #define QTGUI_H
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 #include "qtluaengine.h"
 #include "qtluautils.h"
 
@@ -19,6 +21,8 @@
 # define QTGUI_API /**/
 #endif
 
+#define LUA_EXTERNC extern "C"
+
 LUA_EXTERNC QTGUI_API int luaopen_libqtgui(lua_State *L);
 
 
diff --git a/packages/qtide/qtide.h b/packages/qtide/qtide.h
index 5300ddf..5d5efe2 100644
--- a/packages/qtide/qtide.h
+++ b/packages/qtide/qtide.h
@@ -3,8 +3,10 @@
 #ifndef QTIDE_H
 #define QTIDE_H
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 #include "qtluaengine.h"
 #include "qtluautils.h"
 
@@ -19,6 +21,8 @@
 # define QTIDE_API /**/
 #endif
 
+#define LUA_EXTERNC extern "C"
+
 LUA_EXTERNC QTIDE_API int luaopen_libqtide(lua_State *L);
 
 #endif
diff --git a/packages/qtsvg/qtluasvggenerator.h b/packages/qtsvg/qtluasvggenerator.h
index c71a29c..c7f4f2c 100644
--- a/packages/qtsvg/qtluasvggenerator.h
+++ b/packages/qtsvg/qtluasvggenerator.h
@@ -3,8 +3,10 @@
 #ifndef QTLUASVGGENERATOR_H
 #define QTLUASVGGENERATOR_H
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 #include "qtluaengine.h"
 #include "qtluautils.h"
 
diff --git a/packages/qtsvg/qtsvg.h b/packages/qtsvg/qtsvg.h
index a527df2..f178aa4 100644
--- a/packages/qtsvg/qtsvg.h
+++ b/packages/qtsvg/qtsvg.h
@@ -3,8 +3,10 @@
 #ifndef QTSVG_H
 #define QTSVG_H
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 #include "qtluaengine.h"
 #include "qtluautils.h"
 
@@ -19,6 +21,7 @@
 # define QTSVG_API /**/
 #endif
 
+#define LUA_EXTERNC extern "C"
 
 LUA_EXTERNC QTSVG_API int luaopen_libqtsvg(lua_State *L);
 
diff --git a/packages/qtuiloader/uiloader.cpp b/packages/qtuiloader/uiloader.cpp
index 3bbb366..b5c97e1 100644
--- a/packages/qtuiloader/uiloader.cpp
+++ b/packages/qtuiloader/uiloader.cpp
@@ -2,8 +2,9 @@
 
 
 #include "uiloader.h"
+extern "C" {
 #include "lualib.h"
-
+}
 #include <QAction>
 #include <QActionGroup>
 #include <QApplication>
diff --git a/packages/qtuiloader/uiloader.h b/packages/qtuiloader/uiloader.h
index 54c3f19..728a425 100644
--- a/packages/qtuiloader/uiloader.h
+++ b/packages/qtuiloader/uiloader.h
@@ -3,8 +3,10 @@
 #ifndef UILOADER_H
 #define UILOADER_H
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 #include "qtluaengine.h"
 #include "qtluautils.h"
 
@@ -19,6 +21,8 @@
 # define QTUILOADER_API /**/
 #endif
 
+#define LUA_EXTERNC extern "C"
+
 LUA_EXTERNC QTUILOADER_API int luaopen_libqtuiloader(lua_State *L);
 
 
diff --git a/packages/qtwidget/qtwidget.h b/packages/qtwidget/qtwidget.h
index dc14a78..4bf18ec 100644
--- a/packages/qtwidget/qtwidget.h
+++ b/packages/qtwidget/qtwidget.h
@@ -3,8 +3,10 @@
 #ifndef QTWIDGET_H
 #define QTWIDGET_H
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 #include "qtluaengine.h"
 #include "qtluautils.h"
 
@@ -19,6 +21,8 @@
 # define QTWIDGET_API /**/
 #endif
 
+#define LUA_EXTERNC extern "C"
+
 LUA_EXTERNC QTWIDGET_API int luaopen_libqtwidget(lua_State *L);
 
 
diff --git a/qlua/qluaapplication.cpp b/qlua/qluaapplication.cpp
index c728025..8b25422 100644
--- a/qlua/qluaapplication.cpp
+++ b/qlua/qluaapplication.cpp
@@ -36,8 +36,10 @@
 #include <QTimer>
 #include <QThread>
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 #include "qtluaengine.h"
 #include "qtluautils.h"
 
diff --git a/qlua/qluaconsole_unix.cpp b/qlua/qluaconsole_unix.cpp
index 6ecb517..e68b830 100644
--- a/qlua/qluaconsole_unix.cpp
+++ b/qlua/qluaconsole_unix.cpp
@@ -61,8 +61,10 @@
 #include <QTimer>
 #include <QWaitCondition>
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 
 #include "qluaconsole.h"
 #include "qtluaengine.h"
diff --git a/qlua/qluaconsole_win.cpp b/qlua/qluaconsole_win.cpp
index a7545b6..50bee0b 100644
--- a/qlua/qluaconsole_win.cpp
+++ b/qlua/qluaconsole_win.cpp
@@ -29,8 +29,10 @@
 #include <QTimer>
 #include <QWaitCondition>
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 
 #include "qluaconsole.h"
 #include "qtluaengine.h"
diff --git a/qtlua/qtluaengine.cpp b/qtlua/qtluaengine.cpp
index 6762ee2..1fe1449 100644
--- a/qtlua/qtluaengine.cpp
+++ b/qtlua/qtluaengine.cpp
@@ -4,8 +4,9 @@
 
 #include "qtluautils.h"
 #include "qtluaengine.h"
+extern "C" {
 #include "lualib.h"
-
+}
 #include <QCoreApplication>
 #include <QDebug>
 #include <QEvent>
diff --git a/qtlua/qtluaengine.h b/qtlua/qtluaengine.h
index a891d9c..7d6da02 100644
--- a/qtlua/qtluaengine.h
+++ b/qtlua/qtluaengine.h
@@ -14,8 +14,10 @@
 #include <QStringList>
 #include <QVariant>
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 #include "qtluaconf.h"
 
 typedef QPointer<QObject> QObjectPointer;
diff --git a/qtlua/qtluautils.h b/qtlua/qtluautils.h
index 634efee..cc25871 100644
--- a/qtlua/qtluautils.h
+++ b/qtlua/qtluautils.h
@@ -3,8 +3,10 @@
 #ifndef QTLUAUTILS_H
 #define QTLUAUTILS_H
 
+extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
+}
 #include "qtluaconf.h"
 
 #ifdef WIN32