Merge branch 'master' into jgrpp-beta
# Conflicts: # .github/workflows/commit-checker.yml # src/company_cmd.cpp # src/console_cmds.cpp # src/crashlog.cpp # src/lang/english.txt # src/lang/german.txt # src/lang/indonesian.txt # src/lang/japanese.txt # src/lang/korean.txt # src/lang/swedish.txt # src/linkgraph/linkgraphjob.cpp # src/linkgraph/mcf.cpp # src/network/core/tcp.cpp # src/network/core/tcp.h # src/network/core/tcp_game.h # src/network/core/udp.h # src/network/network.cpp # src/network/network_admin.cpp # src/network/network_admin.h # src/network/network_chat_gui.cpp # src/network/network_client.cpp # src/network/network_client.h # src/network/network_func.h # src/network/network_internal.h # src/network/network_server.cpp # src/network/network_server.h # src/newgrf.cpp # src/newgrf_station.cpp # src/order_gui.cpp # src/rail_cmd.cpp # src/saveload/saveload.cpp # src/settings.cpp # src/settings_gui.cpp # src/settings_internal.h # src/settings_type.h # src/station_cmd.cpp # src/stdafx.h # src/table/currency_settings.ini # src/table/misc_settings.ini # src/table/settings.h.preamble # src/table/settings.ini # src/terraform_cmd.cpp # src/timetable_gui.cpp # src/train_cmd.cpp # src/tree_cmd.cpp # src/water_cmd.cpp
This commit is contained in:
@@ -33,6 +33,7 @@
|
||||
#if defined(__HAIKU__)
|
||||
# include <SupportDefs.h>
|
||||
# include <unistd.h>
|
||||
# define _DEFAULT_SOURCE
|
||||
# define _GNU_SOURCE
|
||||
# define TROUBLED_INTS
|
||||
#endif
|
||||
@@ -130,6 +131,7 @@
|
||||
/* Warn about functions using 'printf' format syntax. First argument determines which parameter
|
||||
* is the format string, second argument is start of values passed to printf. */
|
||||
#define WARN_FORMAT(string, args) __attribute__ ((format (printf, string, args)))
|
||||
#define WARN_TIME_FORMAT(string) __attribute__ ((format (strftime, string, 0)))
|
||||
#define FINAL final
|
||||
|
||||
/* Use fallthrough attribute where supported */
|
||||
@@ -154,6 +156,7 @@
|
||||
# define NORETURN
|
||||
# define CDECL
|
||||
# define WARN_FORMAT(string, args)
|
||||
# define WARN_TIME_FORMAT(string)
|
||||
# define FINAL
|
||||
# define FALLTHROUGH
|
||||
# include <malloc.h>
|
||||
@@ -202,6 +205,7 @@
|
||||
|
||||
# define CDECL _cdecl
|
||||
# define WARN_FORMAT(string, args)
|
||||
# define WARN_TIME_FORMAT(string)
|
||||
# define FINAL final
|
||||
|
||||
/* fallthrough attribute, VS 2017 */
|
||||
|
Reference in New Issue
Block a user