>From 5161a37128e3422a5af073e35361442f1e2b54d4 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 15 Oct 2023 13:15:11 +0200 Subject: [PATCH 8/8] MSVC port, part 8: --speech-friendly option like with mingw. * info/info.c (speech_friendly, short_options, main, info_short_help): Treat native Windows like mingw. --- info/info.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/info/info.c b/info/info.c index 3ab0126a27..44a7045d94 100644 --- a/info/info.c +++ b/info/info.c @@ -99,7 +99,7 @@ static int print_where_p = 0; /* Non-zero means don't try to be smart when searching for nodes. */ int strict_node_location_p = 0; -#if defined(__MSDOS__) || defined(__MINGW32__) +#if defined(__MSDOS__) || defined(_WIN32) /* Non-zero indicates that screen output should be made 'speech-friendly'. Since on MSDOS the usual behavior is to write directly to the video memory, speech synthesizer software cannot grab the output. Therefore, @@ -143,14 +143,14 @@ static struct option long_options[] = { { "version", 0, &print_version_p, 1 }, { "vi-keys", 0, &vi_keys_p, 1 }, { "where", 0, &print_where_p, 1 }, -#if defined(__MSDOS__) || defined(__MINGW32__) +#if defined(__MSDOS__) || defined(_WIN32) { "speech-friendly", 0, &speech_friendly, 1 }, #endif {NULL, 0, NULL, 0} }; /* String describing the shorthand versions of the long options found above. */ -#if defined(__MSDOS__) || defined(__MINGW32__) +#if defined(__MSDOS__) || defined(_WIN32) static char *short_options = "ak:d:n:f:ho:ORsv:wbx:"; #else static char *short_options = "ak:d:n:f:ho:ORv:wsx:"; @@ -786,12 +786,12 @@ main (int argc, char *argv[]) print_where_p = 1; break; -#if defined(__MSDOS__) || defined(__MINGW32__) +#if defined(__MSDOS__) || defined(_WIN32) /* User wants speech-friendly output. */ case 'b': speech_friendly = 1; break; -#endif /* __MSDOS__ || __MINGW32__ */ +#endif /* __MSDOS__ || _WIN32 */ /* User has specified a string to search all indices for. */ case 'k': @@ -1119,7 +1119,7 @@ Frequently-used options:\n\ -n, --node=NODENAME specify nodes in first visited Info file\n\ -o, --output=FILE output selected nodes to FILE")); -#if defined(__MSDOS__) || defined(__MINGW32__) +#if defined(__MSDOS__) || defined(_WIN32) puts (_("\ -b, --speech-friendly be friendly to speech synthesizers")); #endif -- 2.34.1