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

Merge pull request #438 from ennorehling/master 

Address MS Visual Studio 2015 update 1 breaking changes
This commit is contained in:
Enno Rehling 2015-12-16 17:00:39 +01:00
parent 9b5b79e75d 24f559b4ad
commit 5e3ab01f17
2 changed files with 2 additions and 1 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"