Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/release-windows.yml
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/economy.cpp
#	src/economy_cmd.h
#	src/fios.h
#	src/goal.cpp
#	src/group_gui.cpp
#	src/network/core/config.h
#	src/network/network_admin.cpp
#	src/newgrf_config.cpp
#	src/os/windows/win32.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/story.cpp
#	src/story_base.h
#	src/string.cpp
#	src/table/settings/economy_settings.ini
#	src/tests/CMakeLists.txt
#	src/tests/math_func.cpp
This commit is contained in:
Jonathan G Rennison
2023-05-30 00:49:14 +01:00
156 changed files with 2979 additions and 4098 deletions

View File

@@ -37,10 +37,6 @@
# define _GNU_SOURCE
#endif
#if defined(__HAIKU__) || defined(__CYGWIN__)
# include <strings.h> /* strncasecmp */
#endif
/* It seems that we need to include stdint.h before anything else
* We need INT64_MAX, which for most systems comes from stdint.h. However, MSVC
* does not have stdint.h.
@@ -69,11 +65,6 @@
# include <sys/types.h>
#endif
#if defined(__OS2__)
# include <types.h>
# define strcasecmp stricmp
#endif
#if defined(SUNOS) || defined(HPUX) || defined(__CYGWIN__)
# include <alloca.h>
#endif
@@ -215,9 +206,6 @@
# endif
# endif
# define strcasecmp stricmp
# define strncasecmp strnicmp
/* MSVC doesn't have these :( */
# define S_ISDIR(mode) (mode & S_IFDIR)
# define S_ISREG(mode) (mode & S_IFREG)
@@ -490,11 +478,6 @@ const char *assert_tile_info(uint32 tile);
# define dbg_assert_tile(expression, tile)
#endif
#if defined(OPENBSD)
/* OpenBSD uses strcasecmp(3) */
# define _stricmp strcasecmp
#endif
#if defined(MAX_PATH)
/* It's already defined, no need to override */
#elif defined(PATH_MAX) && PATH_MAX > 0