Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #439 from ennorehling/develop 

MS Visual Studio 2015 update 1 breaking changes
This commit is contained in:
Enno Rehling 2015-12-16 17:06:04 +01:00
parent a2e7e6476c fadccb5bd6
commit d85123fe8b
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bind_tolua.c
View File

@ -8,6 +8,7 @@
#include "log.pkg.c" #include "log.pkg.c"
#include "process.pkg.c" #include "process.pkg.c"
#include "settings.pkg.c" #include "settings.pkg.c"
#pragma warning(pop)
void tolua_bind_open(lua_State * L) { void tolua_bind_open(lua_State * L) {
tolua_eressea_open(L); tolua_eressea_open(L);

2
src/kernel/save.c
View File

@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <kernel/config.h> #include <kernel/config.h>
#include "save.h" #include "save.h"
#include "../buildno.h" #include <buildno.h>
#include "alchemy.h" #include "alchemy.h"
#include "alliance.h" #include "alliance.h"

2
src/triggers/shock.test.c
View File

@ -1,7 +1,7 @@
#include <platform.h> #include <platform.h>
#include "shock.h" #include "shock.h"
#include "../magic.h"
#include <magic.h>
#include <kernel/unit.h> #include <kernel/unit.h>
#include <kernel/faction.h> #include <kernel/faction.h>
#include <util/event.h> #include <util/event.h>