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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/debug.cpp
This commit is contained in:
Jonathan G Rennison
2019-01-02 16:09:44 +00:00
parent afae7ca810 391bc45c41
commit 4f1d54564e
40 changed files with 491 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/endian_type.hpp
View File

@@ -26,7 +26,7 @@
#define TTD_BIG_ENDIAN 1
/* Windows has always LITTLE_ENDIAN */
#if defined(WIN32) || defined(__OS2__) || defined(WIN64)
#if defined(_WIN32) || defined(__OS2__)
# define TTD_ENDIAN TTD_LITTLE_ENDIAN
#elif defined(OSX)
# include <sys/types.h>
@@ -42,6 +42,6 @@
# else
# define TTD_ENDIAN TTD_BIG_ENDIAN
# endif
#endif /* WIN32 || __OS2__ || WIN64 */
#endif /* _WIN32 || __OS2__ */
#endif /* ENDIAN_TYPE_HPP */