From dd947db289346b5cdc4c77cc66afed0a7d539d4c Mon Sep 17 00:00:00 2001 From: Pentarctagon Date: Thu, 3 Mar 2022 00:00:39 -0600 Subject: [PATCH] Avoid lua build warning without altering source code. --- src/ai/default/aspect_attacks.cpp | 2 +- src/ai/lua/aspect_advancements.cpp | 4 ++-- src/ai/lua/core.cpp | 6 +++--- src/ai/lua/lua_object.cpp | 2 +- src/ai/lua/lua_object.hpp | 2 +- src/build_info.cpp | 2 +- src/nowarn/lauxlib.h | 18 ++++++++++++++++++ src/nowarn/llimits.h | 13 +++++++++++++ src/nowarn/lua.h | 13 +++++++++++++ src/nowarn/luaconf.h | 13 +++++++++++++ src/nowarn/lualib.h | 13 +++++++++++++ src/scripting/application_lua_kernel.cpp | 6 +++--- src/scripting/debug_lua.hpp | 2 +- src/scripting/game_lua_kernel.cpp | 4 ++-- src/scripting/lua_audio.cpp | 4 ++-- src/scripting/lua_color.cpp | 4 ++-- src/scripting/lua_common.cpp | 4 ++-- src/scripting/lua_cpp_function.cpp | 4 ++-- src/scripting/lua_fileops.cpp | 8 ++------ src/scripting/lua_formula_bridge.cpp | 4 ++-- src/scripting/lua_gui2.cpp | 4 ++-- src/scripting/lua_kernel_base.cpp | 6 +++--- src/scripting/lua_map_location_ops.cpp | 4 ++-- src/scripting/lua_mathx.cpp | 6 +++--- src/scripting/lua_pathfind_cost_calculator.hpp | 3 ++- src/scripting/lua_preferences.cpp | 4 ++-- src/scripting/lua_race.cpp | 4 ++-- src/scripting/lua_rng.cpp | 4 ++-- src/scripting/lua_stringx.cpp | 4 ++-- src/scripting/lua_team.cpp | 4 ++-- src/scripting/lua_terrainfilter.cpp | 4 ++-- src/scripting/lua_terrainmap.cpp | 4 ++-- src/scripting/lua_unit.cpp | 4 ++-- src/scripting/lua_unit_attacks.cpp | 4 ++-- src/scripting/lua_unit_type.cpp | 4 ++-- src/scripting/lua_widget.cpp | 4 ++-- src/scripting/lua_widget_attributes.cpp | 4 ++-- src/scripting/lua_widget_methods.cpp | 4 ++-- src/scripting/lua_wml.cpp | 4 ++-- src/scripting/mapgen_lua_kernel.cpp | 4 ++-- src/scripting/push_check.hpp | 3 +-- 41 files changed, 140 insertions(+), 74 deletions(-) create mode 100644 src/nowarn/lauxlib.h create mode 100644 src/nowarn/llimits.h create mode 100644 src/nowarn/lua.h create mode 100644 src/nowarn/luaconf.h create mode 100644 src/nowarn/lualib.h diff --git a/src/ai/default/aspect_attacks.cpp b/src/ai/default/aspect_attacks.cpp index 88889ddb4db..4803222c496 100644 --- a/src/ai/default/aspect_attacks.cpp +++ b/src/ai/default/aspect_attacks.cpp @@ -24,7 +24,7 @@ #include "ai/manager.hpp" #include "game_board.hpp" #include "log.hpp" -#include "lua/lauxlib.h" +#include "nowarn/lauxlib.h" #include "map/map.hpp" #include "pathfind/pathfind.hpp" #include "resources.hpp" diff --git a/src/ai/lua/aspect_advancements.cpp b/src/ai/lua/aspect_advancements.cpp index bab1b1448e4..c0f3f619ffb 100644 --- a/src/ai/lua/aspect_advancements.cpp +++ b/src/ai/lua/aspect_advancements.cpp @@ -16,8 +16,8 @@ #include "ai/lua/aspect_advancements.hpp" #include "log.hpp" // for LOG_STREAM, logger, etc -#include "lua/lauxlib.h" // for luaL_ref, LUA_REFNIL -#include "lua/lua.h" // for lua_isstring, etc +#include "nowarn/lauxlib.h" // for luaL_ref, LUA_REFNIL +#include "nowarn/lua.h" // for lua_isstring, etc #include "map/location.hpp" // for map_location #include "serialization/string_utils.hpp" // for split #include "units/unit.hpp" diff --git a/src/ai/lua/core.cpp b/src/ai/lua/core.cpp index 956986b4498..1bfeb8fdb0d 100644 --- a/src/ai/lua/core.cpp +++ b/src/ai/lua/core.cpp @@ -44,9 +44,9 @@ #include "ai/composite/contexts.hpp" #include "ai/default/aspect_attacks.hpp" -#include "lua/lualib.h" -#include "lua/lauxlib.h" -#include "lua/llimits.h" +#include "nowarn/lualib.h" +#include "nowarn/lauxlib.h" +#include "nowarn/llimits.h" static lg::log_domain log_ai_engine_lua("ai/engine/lua"); #define LOG_LUA LOG_STREAM(info, log_ai_engine_lua) diff --git a/src/ai/lua/lua_object.cpp b/src/ai/lua/lua_object.cpp index 21d1c846fd3..44b61ce4c70 100644 --- a/src/ai/lua/lua_object.cpp +++ b/src/ai/lua/lua_object.cpp @@ -24,7 +24,7 @@ #include "scripting/lua_common.hpp" #include "resources.hpp" -#include "lua/lauxlib.h" +#include "nowarn/lauxlib.h" namespace ai { diff --git a/src/ai/lua/lua_object.hpp b/src/ai/lua/lua_object.hpp index 67ce5229a7b..380dabe1b59 100644 --- a/src/ai/lua/lua_object.hpp +++ b/src/ai/lua/lua_object.hpp @@ -22,7 +22,7 @@ #include "config.hpp" #include "log.hpp" -#include "lua/lua.h" +#include "nowarn/lua.h" #include "map/location.hpp" #include "resources.hpp" #include "scripting/lua_common.hpp" diff --git a/src/build_info.cpp b/src/build_info.cpp index 516df0e256a..80d04026eb8 100644 --- a/src/build_info.cpp +++ b/src/build_info.cpp @@ -33,7 +33,7 @@ #include #include -#include "lua/lua.h" +#include "nowarn/lua.h" #include #include diff --git a/src/nowarn/lauxlib.h b/src/nowarn/lauxlib.h new file mode 100644 index 00000000000..14393866541 --- /dev/null +++ b/src/nowarn/lauxlib.h @@ -0,0 +1,18 @@ +#pragma once + +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wold-style-cast" + #include "lua/lauxlib.h" + constexpr int lual_buffersize = LUAL_BUFFERSIZE; + #pragma clang diagnostic pop +#elif defined(__GNUG__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wold-style-cast" + #include "lua/lauxlib.h" + constexpr int lual_buffersize = LUAL_BUFFERSIZE; + #pragma GCC diagnostic pop +#elif defined(_MSC_VER) + #include "lua/lauxlib.h" + constexpr int lual_buffersize = LUAL_BUFFERSIZE; +#endif diff --git a/src/nowarn/llimits.h b/src/nowarn/llimits.h new file mode 100644 index 00000000000..995be2022ab --- /dev/null +++ b/src/nowarn/llimits.h @@ -0,0 +1,13 @@ +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wold-style-cast" + #include "lua/llimits.h" + #pragma clang diagnostic pop +#elif defined(__GNUG__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wold-style-cast" + #include "lua/llimits.h" + #pragma GCC diagnostic pop +#elif defined(_MSC_VER) + #include "lua/llimits.h" +#endif diff --git a/src/nowarn/lua.h b/src/nowarn/lua.h new file mode 100644 index 00000000000..1b7ea601e05 --- /dev/null +++ b/src/nowarn/lua.h @@ -0,0 +1,13 @@ +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wold-style-cast" + #include "lua/lua.h" + #pragma clang diagnostic pop +#elif defined(__GNUG__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wold-style-cast" + #include "lua/lua.h" + #pragma GCC diagnostic pop +#elif defined(_MSC_VER) + #include "lua/lua.h" +#endif diff --git a/src/nowarn/luaconf.h b/src/nowarn/luaconf.h new file mode 100644 index 00000000000..a5ffa459113 --- /dev/null +++ b/src/nowarn/luaconf.h @@ -0,0 +1,13 @@ +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wold-style-cast" + #include "lua/luaconf.h" + #pragma clang diagnostic pop +#elif defined(__GNUG__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wold-style-cast" + #include "lua/luaconf.h" + #pragma GCC diagnostic pop +#elif defined(_MSC_VER) + #include "lua/luaconf.h" +#endif diff --git a/src/nowarn/lualib.h b/src/nowarn/lualib.h new file mode 100644 index 00000000000..2f34f999159 --- /dev/null +++ b/src/nowarn/lualib.h @@ -0,0 +1,13 @@ +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wold-style-cast" + #include "lua/lualib.h" + #pragma clang diagnostic pop +#elif defined(__GNUG__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wold-style-cast" + #include "lua/lualib.h" + #pragma GCC diagnostic pop +#elif defined(_MSC_VER) + #include "lua/lualib.h" +#endif diff --git a/src/scripting/application_lua_kernel.cpp b/src/scripting/application_lua_kernel.cpp index fbaff47fa89..99507335188 100644 --- a/src/scripting/application_lua_kernel.cpp +++ b/src/scripting/application_lua_kernel.cpp @@ -50,9 +50,9 @@ #include #include -#include "lua/lauxlib.h" -#include "lua/lua.h" -#include "lua/luaconf.h" +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/luaconf.h" struct lua_State; diff --git a/src/scripting/debug_lua.hpp b/src/scripting/debug_lua.hpp index 1f4b695a85d..565b5805969 100644 --- a/src/scripting/debug_lua.hpp +++ b/src/scripting/debug_lua.hpp @@ -17,7 +17,7 @@ #pragma once -#include "lua/lualib.h" +#include "nowarn/lualib.h" void ds(lua_State *L, const bool verbose_table = true); diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp index 435f98fd330..90546f25547 100644 --- a/src/scripting/game_lua_kernel.cpp +++ b/src/scripting/game_lua_kernel.cpp @@ -122,8 +122,8 @@ #include #include // for vector, etc #include // for SDL_GetTicks -#include "lua/lauxlib.h" // for luaL_checkinteger, etc -#include "lua/lua.h" // for lua_setfield, etc +#include "nowarn/lauxlib.h" // for luaL_checkinteger, etc +#include "nowarn/lua.h" // for lua_setfield, etc class CVideo; diff --git a/src/scripting/lua_audio.cpp b/src/scripting/lua_audio.cpp index f0dc03800c9..b0ec4c4bd5d 100644 --- a/src/scripting/lua_audio.cpp +++ b/src/scripting/lua_audio.cpp @@ -15,8 +15,8 @@ #include "lua_audio.hpp" #include "log.hpp" -#include "lua/lua.h" -#include "lua/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/lauxlib.h" #include "scripting/lua_common.hpp" #include "scripting/push_check.hpp" #include "sound.hpp" diff --git a/src/scripting/lua_color.cpp b/src/scripting/lua_color.cpp index c1481ed4aa5..2711f9f069f 100644 --- a/src/scripting/lua_color.cpp +++ b/src/scripting/lua_color.cpp @@ -16,8 +16,8 @@ #include "scripting/lua_color.hpp" #include "scripting/lua_common.hpp" #include "scripting/push_check.hpp" -#include "lua/lauxlib.h" -#include "lua/lua.h" // for lua_State, lua_settop, etc +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" // for lua_State, lua_settop, etc #include "log.hpp" #include "game_config.hpp" diff --git a/src/scripting/lua_common.cpp b/src/scripting/lua_common.cpp index 145fd2f6774..b06137828f1 100644 --- a/src/scripting/lua_common.cpp +++ b/src/scripting/lua_common.cpp @@ -39,8 +39,8 @@ #include // for operator new #include // for string, basic_string -#include "lua/lauxlib.h" -#include "lua/lua.h" +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" static const char gettextKey[] = "gettext"; static const char vconfigKey[] = "vconfig"; diff --git a/src/scripting/lua_cpp_function.cpp b/src/scripting/lua_cpp_function.cpp index e625079621c..85ab0ad00ce 100644 --- a/src/scripting/lua_cpp_function.cpp +++ b/src/scripting/lua_cpp_function.cpp @@ -20,8 +20,8 @@ #include #include -#include "lua/lauxlib.h" -#include "lua/lua.h" +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" #include "scripting/lua_common.hpp" // for new(L) static lg::log_domain log_scripting_lua("scripting/lua"); diff --git a/src/scripting/lua_fileops.cpp b/src/scripting/lua_fileops.cpp index b423b599d52..3b098554f25 100644 --- a/src/scripting/lua_fileops.cpp +++ b/src/scripting/lua_fileops.cpp @@ -28,10 +28,6 @@ #include #include -#include "lua/lauxlib.h" -#include "lua/lua.h" -#include "lua/luaconf.h" // for LUAL_BUFFERSIZE - static lg::log_domain log_scripting_lua("scripting/lua"); #define DBG_LUA LOG_STREAM(debug, log_scripting_lua) #define LOG_LUA LOG_STREAM(info, log_scripting_lua) @@ -264,7 +260,7 @@ public: lua_filestream* lfs = static_cast(data); //int startpos = lfs->pistream_->tellg(); - lfs->pistream_->read(lfs->buff_, LUAL_BUFFERSIZE); + lfs->pistream_->read(lfs->buff_, lual_buffersize); //int newpos = lfs->pistream_->tellg(); *size = lfs->pistream_->gcount(); #if 0 @@ -287,7 +283,7 @@ public: return lua_load(L, &lua_filestream::lua_read_data, &lfs, chunkname.c_str(), "t"); } private: - char buff_[LUAL_BUFFERSIZE]; + char buff_[lual_buffersize]; const std::unique_ptr pistream_; }; diff --git a/src/scripting/lua_formula_bridge.cpp b/src/scripting/lua_formula_bridge.cpp index 2dfc717f3fb..2cd414f69e7 100644 --- a/src/scripting/lua_formula_bridge.cpp +++ b/src/scripting/lua_formula_bridge.cpp @@ -18,8 +18,8 @@ #include "scripting/game_lua_kernel.hpp" #include "scripting/lua_unit.hpp" #include "scripting/lua_common.hpp" -#include "lua/lauxlib.h" -#include "lua/lua.h" +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" #include "formula/callable_objects.hpp" #include "formula/formula.hpp" #include "variable.hpp" diff --git a/src/scripting/lua_gui2.cpp b/src/scripting/lua_gui2.cpp index c519567bd1b..5c706e9e7d8 100644 --- a/src/scripting/lua_gui2.cpp +++ b/src/scripting/lua_gui2.cpp @@ -49,8 +49,8 @@ #include #include -#include "lua/lauxlib.h" // for luaL_checkinteger, etc -#include "lua/lua.h" // for lua_setfield, etc +#include "nowarn/lauxlib.h" // for luaL_checkinteger, etc +#include "nowarn/lua.h" // for lua_setfield, etc static lg::log_domain log_scripting_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_scripting_lua) diff --git a/src/scripting/lua_kernel_base.cpp b/src/scripting/lua_kernel_base.cpp index b4c7f56b089..43dc2010bff 100644 --- a/src/scripting/lua_kernel_base.cpp +++ b/src/scripting/lua_kernel_base.cpp @@ -57,9 +57,9 @@ #include #include -#include "lua/lauxlib.h" -#include "lua/lua.h" -#include "lua/lualib.h" +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/lualib.h" static lg::log_domain log_scripting_lua("scripting/lua"); static lg::log_domain log_user("scripting/lua/user"); diff --git a/src/scripting/lua_map_location_ops.cpp b/src/scripting/lua_map_location_ops.cpp index 0c484b18fce..4aabea6707c 100644 --- a/src/scripting/lua_map_location_ops.cpp +++ b/src/scripting/lua_map_location_ops.cpp @@ -24,8 +24,8 @@ #include #include // for and -#include "lua/lua.h" -#include "lua/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/lauxlib.h" namespace lua_map_location { diff --git a/src/scripting/lua_mathx.cpp b/src/scripting/lua_mathx.cpp index 42a107c2a11..89853f53178 100644 --- a/src/scripting/lua_mathx.cpp +++ b/src/scripting/lua_mathx.cpp @@ -19,9 +19,9 @@ #include "random.hpp" #include "SDL2/SDL_timer.h" // for SDL_GetTicks -#include "lua/lauxlib.h" -#include "lua/lua.h" -#include "lua/lualib.h" +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/lualib.h" #include #include diff --git a/src/scripting/lua_pathfind_cost_calculator.hpp b/src/scripting/lua_pathfind_cost_calculator.hpp index c9c04be218f..4a4a1872c24 100644 --- a/src/scripting/lua_pathfind_cost_calculator.hpp +++ b/src/scripting/lua_pathfind_cost_calculator.hpp @@ -13,7 +13,8 @@ */ #pragma once -#include "lua/lua.h" + +#include "nowarn/lua.h" #include "map/location.hpp" #include "pathfind/pathfind.hpp" diff --git a/src/scripting/lua_preferences.cpp b/src/scripting/lua_preferences.cpp index ff6c1d8c827..d7501d11c50 100644 --- a/src/scripting/lua_preferences.cpp +++ b/src/scripting/lua_preferences.cpp @@ -16,8 +16,8 @@ #include "scripting/lua_preferences.hpp" #include "config.hpp" -#include "lua/lua.h" -#include "lua/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/lauxlib.h" #include "preferences/general.hpp" #include "scripting/lua_common.hpp" diff --git a/src/scripting/lua_race.cpp b/src/scripting/lua_race.cpp index 8cb45fc1595..61a0b3cd4d5 100644 --- a/src/scripting/lua_race.cpp +++ b/src/scripting/lua_race.cpp @@ -23,8 +23,8 @@ #include #include -#include "lua/lua.h" -#include "lua/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/lauxlib.h" /** * Implementation for a lua reference to a race, diff --git a/src/scripting/lua_rng.cpp b/src/scripting/lua_rng.cpp index 0d340d090d9..387318f7ecf 100644 --- a/src/scripting/lua_rng.cpp +++ b/src/scripting/lua_rng.cpp @@ -23,8 +23,8 @@ #include #include -#include "lua/lua.h" -#include "lua/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/lauxlib.h" static lg::log_domain log_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_lua) diff --git a/src/scripting/lua_stringx.cpp b/src/scripting/lua_stringx.cpp index d7b8eef77c1..207db08c588 100644 --- a/src/scripting/lua_stringx.cpp +++ b/src/scripting/lua_stringx.cpp @@ -23,8 +23,8 @@ #include -#include "lua/lua.h" -#include "lua/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/lauxlib.h" namespace lua_stringx { diff --git a/src/scripting/lua_team.cpp b/src/scripting/lua_team.cpp index dbb4bfb4ec5..d57dc4f57fa 100644 --- a/src/scripting/lua_team.cpp +++ b/src/scripting/lua_team.cpp @@ -26,8 +26,8 @@ #include -#include "lua/lua.h" -#include "lua/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/lauxlib.h" /** * Implementation for a lua reference to a team, diff --git a/src/scripting/lua_terrainfilter.cpp b/src/scripting/lua_terrainfilter.cpp index b7f18dd53b4..79b30da46a1 100644 --- a/src/scripting/lua_terrainfilter.cpp +++ b/src/scripting/lua_terrainfilter.cpp @@ -33,8 +33,8 @@ #include #include #include -#include "lua/lauxlib.h" -#include "lua/lua.h" +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" static lg::log_domain log_scripting_lua_mapgen("scripting/lua/mapgen"); #define LOG_LMG LOG_STREAM(info, log_scripting_lua_mapgen) diff --git a/src/scripting/lua_terrainmap.cpp b/src/scripting/lua_terrainmap.cpp index 635b5e67db0..85fbde9934b 100644 --- a/src/scripting/lua_terrainmap.cpp +++ b/src/scripting/lua_terrainmap.cpp @@ -27,8 +27,8 @@ #include "game_board.hpp" #include "play_controller.hpp" -#include "lua/lauxlib.h" -#include "lua/lua.h" +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" static lg::log_domain log_scripting_lua("scripting/lua"); #define LOG_LUA LOG_STREAM(info, log_scripting_lua) diff --git a/src/scripting/lua_unit.cpp b/src/scripting/lua_unit.cpp index f3bf4285a3e..57e5a75def4 100644 --- a/src/scripting/lua_unit.cpp +++ b/src/scripting/lua_unit.cpp @@ -31,8 +31,8 @@ #include "game_version.hpp" #include "deprecation.hpp" -#include "lua/lauxlib.h" -#include "lua/lua.h" // for lua_State, lua_settop, etc +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" // for lua_State, lua_settop, etc static lg::log_domain log_scripting_lua("scripting/lua"); #define LOG_LUA LOG_STREAM(info, log_scripting_lua) diff --git a/src/scripting/lua_unit_attacks.cpp b/src/scripting/lua_unit_attacks.cpp index 09dd1a79671..7f906c88c1c 100644 --- a/src/scripting/lua_unit_attacks.cpp +++ b/src/scripting/lua_unit_attacks.cpp @@ -24,8 +24,8 @@ #include "units/attack_type.hpp" #include "utils/const_clone.hpp" -#include "lua/lauxlib.h" -#include "lua/lua.h" // for lua_State, lua_settop, etc +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" // for lua_State, lua_settop, etc #include diff --git a/src/scripting/lua_unit_type.cpp b/src/scripting/lua_unit_type.cpp index e5dd6b584a1..2e9257c3f9b 100644 --- a/src/scripting/lua_unit_type.cpp +++ b/src/scripting/lua_unit_type.cpp @@ -23,8 +23,8 @@ #include #include -#include "lua/lua.h" -#include "lua/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/lauxlib.h" /** * Implementation for a lua reference to a unit_type. diff --git a/src/scripting/lua_widget.cpp b/src/scripting/lua_widget.cpp index a8d4e17ecd7..a82ca1ad159 100644 --- a/src/scripting/lua_widget.cpp +++ b/src/scripting/lua_widget.cpp @@ -25,8 +25,8 @@ #include "scripting/push_check.hpp" -#include "lua/lauxlib.h" -#include "lua/lua.h" // for lua_State, lua_settop, etc +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" // for lua_State, lua_settop, etc #include diff --git a/src/scripting/lua_widget_attributes.cpp b/src/scripting/lua_widget_attributes.cpp index 8d1adbcfabe..e1749575625 100644 --- a/src/scripting/lua_widget_attributes.cpp +++ b/src/scripting/lua_widget_attributes.cpp @@ -54,8 +54,8 @@ #include #include -#include "lua/lauxlib.h" // for luaL_checkinteger, etc -#include "lua/lua.h" // for lua_setfield, etc +#include "nowarn/lauxlib.h" // for luaL_checkinteger, etc +#include "nowarn/lua.h" // for lua_setfield, etc static lg::log_domain log_scripting_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_scripting_lua) diff --git a/src/scripting/lua_widget_methods.cpp b/src/scripting/lua_widget_methods.cpp index 4e695a9a12a..54f9323e13c 100644 --- a/src/scripting/lua_widget_methods.cpp +++ b/src/scripting/lua_widget_methods.cpp @@ -50,8 +50,8 @@ #include #include -#include "lua/lauxlib.h" -#include "lua/lua.h" +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" static lg::log_domain log_scripting_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_scripting_lua) diff --git a/src/scripting/lua_wml.cpp b/src/scripting/lua_wml.cpp index 10b68d22e8a..eb43d0bf685 100644 --- a/src/scripting/lua_wml.cpp +++ b/src/scripting/lua_wml.cpp @@ -25,8 +25,8 @@ #include -#include "lua/lua.h" -#include "lua/lauxlib.h" +#include "nowarn/lua.h" +#include "nowarn/lauxlib.h" namespace lua_wml { diff --git a/src/scripting/mapgen_lua_kernel.cpp b/src/scripting/mapgen_lua_kernel.cpp index 1beea945309..87dba9cc287 100644 --- a/src/scripting/mapgen_lua_kernel.cpp +++ b/src/scripting/mapgen_lua_kernel.cpp @@ -30,8 +30,8 @@ #include #include -#include "lua/lauxlib.h" -#include "lua/lua.h" +#include "nowarn/lauxlib.h" +#include "nowarn/lua.h" #include "scripting/push_check.hpp" #include "generators/default_map_generator_job.hpp" diff --git a/src/scripting/push_check.hpp b/src/scripting/push_check.hpp index 957d091d145..76798a3d78f 100644 --- a/src/scripting/push_check.hpp +++ b/src/scripting/push_check.hpp @@ -17,11 +17,10 @@ #include "scripting/lua_common.hpp" #include "scripting/lua_widget.hpp" +#include "nowarn/lauxlib.h" #include "global.hpp" #include "tstring.hpp" #include "map/location.hpp" -#include "lua/lauxlib.h" -#include "lua/lua.h" #include #include