From d14573f8ce1f86279c37120336cf9746f13f45e1 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 26 Mar 2022 15:21:38 +0200 Subject: [PATCH 23/23] Replace "Win32" where ever "Windows" should be used See osdn #44117 Signed-off-by: Marko Lindqvist --- INSTALL | 6 +++--- client/connectdlg_common.c | 2 +- client/gui-gtk-3.0/gui_main.c | 2 +- client/gui-gtk-3.22/gui_main.c | 2 +- client/gui-gtk-4.0/gui_main.c | 2 +- client/plrdlg_common.c | 2 +- utility/shared.h | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/INSTALL b/INSTALL index b7638eef9c..d535d237b6 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installing Freeciv: This file describes how to compile and install Freeciv. Last time we made sure this file is up to date was 16-Jul-06. -Last minor update was 02-Mar-22. +Last minor update was 26-Mar-22. There may be a localized version of this file in the ./doc directory, named INSTALL. (e.g., INSTALL.de). @@ -181,7 +181,7 @@ files are found from the system. The "Gtk+" library comes with one companion libraries: "Gdk": - Provides an abstraction layer over X-Windows/LinuxFB/Win32 to implement + Provides an abstraction layer over X-Windows/LinuxFB/Windows to implement basic drawing functions, windows, clipping, etc. Freeciv requires a version of "Gtk+" greater or equal to 3.10.0. @@ -251,7 +251,7 @@ following order: pkg-config, Glib, Atk, Pango, Gdk-Pixbuf, Gtk+. The "Gtk+" library comes with one companion libraries: "Gdk": - Provides an abstraction layer over X-Windows/LinuxFB/Win32 to implement + Provides an abstraction layer over X-Windows/LinuxFB/Windows to implement basic drawing functions, windows, clipping, etc. Freeciv requires a version of "Gtk+" greater or equal to 3.22.0. diff --git a/client/connectdlg_common.c b/client/connectdlg_common.c index 1cd569a594..afab1c0bf5 100644 --- a/client/connectdlg_common.c +++ b/client/connectdlg_common.c @@ -234,7 +234,7 @@ bool client_start_server(void) #if !defined(HAVE_USABLE_FORK) /* Above also implies that this is FREECIV_MSWINDOWS -> - * Win32 that can't use fork() */ + * Windows that can't use fork() */ STARTUPINFO si; PROCESS_INFORMATION pi; diff --git a/client/gui-gtk-3.0/gui_main.c b/client/gui-gtk-3.0/gui_main.c index e4388d4679..94404c02fe 100644 --- a/client/gui-gtk-3.0/gui_main.c +++ b/client/gui-gtk-3.0/gui_main.c @@ -1707,7 +1707,7 @@ void ui_main(int argc, char **argv) parse_options(argc, argv); - /* the locale has already been set in init_nls() and the Win32-specific + /* the locale has already been set in init_nls() and the windows-specific * locale logic in gtk_init() causes problems with zh_CN (see PR#39475) */ gtk_disable_setlocale(); diff --git a/client/gui-gtk-3.22/gui_main.c b/client/gui-gtk-3.22/gui_main.c index 657d10ea65..2422e37840 100644 --- a/client/gui-gtk-3.22/gui_main.c +++ b/client/gui-gtk-3.22/gui_main.c @@ -1786,7 +1786,7 @@ void ui_main(int argc, char **argv) parse_options(argc, argv); - /* the locale has already been set in init_nls() and the Win32-specific + /* the locale has already been set in init_nls() and the windows-specific * locale logic in gtk_init() causes problems with zh_CN (see PR#39475) */ gtk_disable_setlocale(); diff --git a/client/gui-gtk-4.0/gui_main.c b/client/gui-gtk-4.0/gui_main.c index 4af6241dfe..7ae7211775 100644 --- a/client/gui-gtk-4.0/gui_main.c +++ b/client/gui-gtk-4.0/gui_main.c @@ -1782,7 +1782,7 @@ void ui_main(int argc, char **argv) { parse_options(argc, argv); - /* the locale has already been set in init_nls() and the Win32-specific + /* the locale has already been set in init_nls() and the windows-specific * locale logic in gtk_init() causes problems with zh_CN (see PR#39475) */ gtk_disable_setlocale(); diff --git a/client/plrdlg_common.c b/client/plrdlg_common.c index de68986a9f..c37b1e6b09 100644 --- a/client/plrdlg_common.c +++ b/client/plrdlg_common.c @@ -349,7 +349,7 @@ void init_player_dlg_common(void) /************************************************************************//** The only place where this is used is the player dialog. Eventually this should go the way of the dodo with everything here - moved into col_host above, but some of the older clients (+win32) still + moved into col_host above, but some of the older clients still use this function directly. This code in this function is only really needed so that the host is diff --git a/utility/shared.h b/utility/shared.h index 90d13c74e9..3d323bcd7d 100644 --- a/utility/shared.h +++ b/utility/shared.h @@ -113,7 +113,7 @@ enum fc_tristate fc_tristate_or(enum fc_tristate one, enum fc_tristate two); #ifndef PATH_SEPARATOR #if defined(FREECIV_MSWINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) - /* Win32, OS/2, DOS */ + /* Windows, OS/2, DOS */ # define PATH_SEPARATOR ";" #else /* Unix */ @@ -122,7 +122,7 @@ enum fc_tristate fc_tristate_or(enum fc_tristate one, enum fc_tristate two); #endif /* PATH_SEPARATOR */ #if defined(FREECIV_MSWINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) - /* Win32, OS/2, DOS */ + /* Windows, OS/2, DOS */ # define DIR_SEPARATOR "\\" # define DIR_SEPARATOR_CHAR '\\' #else -- 2.35.1