From c04af51c861250c84bd866087167645844d37ea5 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 8 Nov 2011 01:18:16 +0000 Subject: [PATCH] Include lua.hpp rather than the .h versions on non-windows as lua is normally compiled as C, not C++ Originally committed to SVN as r5831. --- aegisub/src/auto4_lua.cpp | 3 +-- aegisub/src/auto4_lua_assfile.cpp | 3 +-- aegisub/src/auto4_lua_dialog.cpp | 3 +-- aegisub/src/auto4_lua_progresssink.cpp | 2 ++ 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp index 9a0fe3892..a27d6ddf9 100644 --- a/aegisub/src/auto4_lua.cpp +++ b/aegisub/src/auto4_lua.cpp @@ -73,8 +73,7 @@ #include "../../contrib/lua51/src/lualib.h" #include "../../contrib/lua51/src/lauxlib.h" #else -#include -#include +#include #endif namespace { diff --git a/aegisub/src/auto4_lua_assfile.cpp b/aegisub/src/auto4_lua_assfile.cpp index 97528a35e..ea4270baf 100644 --- a/aegisub/src/auto4_lua_assfile.cpp +++ b/aegisub/src/auto4_lua_assfile.cpp @@ -63,8 +63,7 @@ #include "../../contrib/lua51/src/lualib.h" #include "../../contrib/lua51/src/lauxlib.h" #else -#include -#include +#include #endif namespace { diff --git a/aegisub/src/auto4_lua_dialog.cpp b/aegisub/src/auto4_lua_dialog.cpp index e30e04d41..a34ef3e20 100644 --- a/aegisub/src/auto4_lua_dialog.cpp +++ b/aegisub/src/auto4_lua_dialog.cpp @@ -68,8 +68,7 @@ #include "../../contrib/lua51/src/lualib.h" #include "../../contrib/lua51/src/lauxlib.h" #else -#include -#include +#include #endif namespace { diff --git a/aegisub/src/auto4_lua_progresssink.cpp b/aegisub/src/auto4_lua_progresssink.cpp index a587f372f..d8aee827e 100644 --- a/aegisub/src/auto4_lua_progresssink.cpp +++ b/aegisub/src/auto4_lua_progresssink.cpp @@ -34,6 +34,8 @@ /// @ingroup scripting /// +#include "config.h" + #ifdef WITH_AUTO4_LUA #include "auto4_lua.h"