From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 23 Oct 2018 11:38:48 +0000 (+0200)
Subject: tool_main: make TerminalSettings static
X-Git-Tag: curl-7_62_0~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae925ddcc3df8a6b490430a89c12f98a94a25fc0;p=curl

tool_main: make TerminalSettings static

Reported-by: Gisle Vanem
Bug: https://github.com/curl/curl/commit/becfe1233ff2b6b0c3e1b6a10048b55b68c2539f#commitcomment-31008819
Closes #3161
---

diff --git a/src/tool_main.c b/src/tool_main.c
index 3a9f0cdff..612bfcb6a 100644
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -238,16 +238,14 @@ static void main_free(struct GlobalConfig *config)
 
 #ifdef _WIN32
 /* TerminalSettings for Windows */
-struct TerminalSettings {
+static struct TerminalSettings {
   HANDLE hStdOut;
   DWORD dwOutputMode;
   UINT nCodepage;
-}TerminalSettings;
-#endif
+} TerminalSettings;
 
 static void configure_terminal(void)
 {
-#ifdef _WIN32
   /*
    * If we're running Windows, enable VT output & set codepage to UTF-8.
    * Note: VT mode flag can be set on any version of Windows, but VT
@@ -273,8 +271,10 @@ static void configure_terminal(void)
                    TerminalSettings.dwOutputMode
                    | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
   }
-#endif
 }
+#else
+#define configure_terminal()
+#endif
 
 static void restore_terminal(void)
 {