aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-10-23 13:38:48 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-10-26 00:59:50 +0200
commitae925ddcc3df8a6b490430a89c12f98a94a25fc0 (patch)
tree8a5a14f28090fcf487d1be51fda3a94d5046e5db
parentabfdf6a0b7b05dcfebb7cdee0c295031b33da1a7 (diff)
tool_main: make TerminalSettings static
Reported-by: Gisle Vanem Bug: https://github.com/curl/curl/commit/becfe1233ff2b6b0c3e1b6a10048b55b68c2539f#commitcomment-31008819 Closes #3161
-rw-r--r--src/tool_main.c10
1 files changed, 5 insertions, 5 deletions
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)
{