dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-07-07 17:28:19 +01:00
parent 641e682e3f de4dc792a9
commit 737ced9f50
18 changed files with 138 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/os2/os2.cpp
View File

@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <time.h>
#ifndef __INNOTEK_LIBC__
#include <dos.h>
# include <dos.h>
#endif
#include "../../safeguards.h"
@@ -36,7 +36,7 @@
#include <os2.h>
#ifndef __INNOTEK_LIBC__
#include <i86.h>
# include <i86.h>
#endif
bool FiosIsRoot(const char *file)

6
src/os/unix/unix.cpp
View File

@@ -29,13 +29,13 @@
#endif
#ifdef __APPLE__
#include <sys/mount.h>
# include <sys/mount.h>
#elif (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) || defined(__GLIBC__)
#define HAS_STATVFS
# define HAS_STATVFS
#endif
#if defined(OPENBSD) || defined(__NetBSD__) || defined(__FreeBSD__)
#define HAS_SYSCTL
# define HAS_SYSCTL
#endif
#ifdef HAS_STATVFS