Unverified Commit ae925ddc authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

tool_main: make TerminalSettings static 

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

src/tool_main.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -238,16 +238,14 @@ static void main_free(struct GlobalConfig *config) 




#ifdef _WIN32

#ifdef _WIN32

/* TerminalSettings for Windows */

/* TerminalSettings for Windows */

struct TerminalSettings {

static struct TerminalSettings {

  HANDLE hStdOut;

  HANDLE hStdOut;

  DWORD dwOutputMode;

  DWORD dwOutputMode;

  UINT nCodepage;

  UINT nCodepage;

} TerminalSettings;

} TerminalSettings;

#endif





static void configure_terminal(void)

static void configure_terminal(void)

{

{

#ifdef _WIN32

  /*

  /*

   * If we're running Windows, enable VT output & set codepage to UTF-8.

   * 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

   * 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

                   TerminalSettings.dwOutputMode

                   | ENABLE_VIRTUAL_TERMINAL_PROCESSING);

                   | ENABLE_VIRTUAL_TERMINAL_PROCESSING);

  }

  }

#endif

}

}

#else

#define configure_terminal()

#endif





static void restore_terminal(void)

static void restore_terminal(void)

{

{