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

compiles with gcc on rpi

This commit is contained in:
Enno Rehling 2017-01-10 18:40:01 +01:00 committed by Enno Rehling
parent 7b25ed282d
commit d1b5daf833
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/jsonconf.test.c
View File

@ -448,7 +448,7 @@ static void test_configs(CuTest * tc)
CuAssertPtrEquals(tc, 0, buildingtypes); CuAssertPtrEquals(tc, 0, buildingtypes);
json_config(json); json_config(json);
CuAssertPtrNotNull(tc, buildingtypes); CuAssertPtrNotNull(tc, buildingtypes);
if (unlink("test.json")!=0 && errno==ENOENT) { if (remove("test.json")!=0 && errno==ENOENT) {
errno = 0; errno = 0;
} }
cJSON_Delete(json); cJSON_Delete(json);

2
src/kernel/save.c
View File

@ -1830,7 +1830,7 @@ int writegame(const char *filename)
join_path(datapath(), filename, path, sizeof(path)); join_path(datapath(), filename, path, sizeof(path));
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
/* make sure we don't overwrite an existing file (hard links) */ /* make sure we don't overwrite an existing file (hard links) */
if (unlink(path)!=0) { if (remove(path)!=0) {
if (errno==ENOENT) { if (errno==ENOENT) {
errno = 0; errno = 0;
} }

4
src/platform.h
View File

@ -10,7 +10,6 @@
#endif #endif
#define NO_STRDUP #define NO_STRDUP
#define NO_MKDIR #define NO_MKDIR
#define NO_UNLINK
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#pragma warning(disable: 4710 4820) #pragma warning(disable: 4710 4820)
#pragma warning(disable: 4100) // unreferenced formal parameter #pragma warning(disable: 4100) // unreferenced formal parameter
@ -38,7 +37,4 @@ char * strdup(const char *s);
int mkdir(const char *pathname, int mode); int mkdir(const char *pathname, int mode);
#endif #endif
#ifdef NO_UNLINK
int unlink(const char *pathname);
#endif
#endif #endif