app, app-tools, libgimp: Use freopen_s on Windows to fix CRT_INSECURE_DEPRECATE
This commit is contained in:
parent
b9ec00c334
commit
3c71c42c31
3 changed files with 33 additions and 0 deletions
|
|
@ -65,8 +65,19 @@ main (int argc,
|
||||||
if (AttachConsole (ATTACH_PARENT_PROCESS) != 0 && ! g_getenv ("TERM") && ! g_getenv ("SHELL"))
|
if (AttachConsole (ATTACH_PARENT_PROCESS) != 0 && ! g_getenv ("TERM") && ! g_getenv ("SHELL"))
|
||||||
{
|
{
|
||||||
/* 'r' is needed to prevent interleaving and '+' to support colors */
|
/* 'r' is needed to prevent interleaving and '+' to support colors */
|
||||||
|
#ifndef _UCRT
|
||||||
freopen ("CONOUT$", "r+", stdout);
|
freopen ("CONOUT$", "r+", stdout);
|
||||||
freopen ("CONOUT$", "r+", stderr);
|
freopen ("CONOUT$", "r+", stderr);
|
||||||
|
#else
|
||||||
|
FILE* fileOut;
|
||||||
|
FILE* fileErr;
|
||||||
|
|
||||||
|
errno_t errOut = freopen_s (&fileOut, "CONOUT$", "r+", stdout);
|
||||||
|
errno_t errErr = freopen_s (&fileErr, "CONOUT$", "r+", stderr);
|
||||||
|
|
||||||
|
if (errOut != 0 || errErr != 0)
|
||||||
|
g_warning ("Failed to redirect streams to CONOUT$. stdout: %d, stderr: %d", errOut, errErr);
|
||||||
|
#endif
|
||||||
_flushall ();
|
_flushall ();
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
||||||
11
app/main.c
11
app/main.c
|
|
@ -962,8 +962,19 @@ gimp_attach_console_window (void)
|
||||||
if (AttachConsole (ATTACH_PARENT_PROCESS) != 0)
|
if (AttachConsole (ATTACH_PARENT_PROCESS) != 0)
|
||||||
{
|
{
|
||||||
/* 'r' is needed to prevent interleaving and '+' to support colors */
|
/* 'r' is needed to prevent interleaving and '+' to support colors */
|
||||||
|
#ifndef _UCRT
|
||||||
freopen ("CONOUT$", "r+", stdout);
|
freopen ("CONOUT$", "r+", stdout);
|
||||||
freopen ("CONOUT$", "r+", stderr);
|
freopen ("CONOUT$", "r+", stderr);
|
||||||
|
#else
|
||||||
|
FILE* fileOut;
|
||||||
|
FILE* fileErr;
|
||||||
|
|
||||||
|
errno_t errOut = freopen_s (&fileOut, "CONOUT$", "r+", stdout);
|
||||||
|
errno_t errErr = freopen_s (&fileErr, "CONOUT$", "r+", stderr);
|
||||||
|
|
||||||
|
if (errOut != 0 || errErr != 0)
|
||||||
|
g_warning ("Failed to redirect streams to CONOUT$. stdout: %d, stderr: %d", errOut, errErr);
|
||||||
|
#endif
|
||||||
_flushall ();
|
_flushall ();
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -205,8 +205,19 @@ gimp_main (GType plug_in_type,
|
||||||
if (AttachConsole (ATTACH_PARENT_PROCESS) != 0 && ! g_getenv ("TERM") && ! g_getenv ("SHELL"))
|
if (AttachConsole (ATTACH_PARENT_PROCESS) != 0 && ! g_getenv ("TERM") && ! g_getenv ("SHELL"))
|
||||||
{
|
{
|
||||||
/* 'r' is needed to prevent interleaving and '+' to support colors */
|
/* 'r' is needed to prevent interleaving and '+' to support colors */
|
||||||
|
#ifndef _UCRT
|
||||||
freopen ("CONOUT$", "r+", stdout);
|
freopen ("CONOUT$", "r+", stdout);
|
||||||
freopen ("CONOUT$", "r+", stderr);
|
freopen ("CONOUT$", "r+", stderr);
|
||||||
|
#else
|
||||||
|
FILE* fileOut;
|
||||||
|
FILE* fileErr;
|
||||||
|
|
||||||
|
errno_t errOut = freopen_s (&fileOut, "CONOUT$", "r+", stdout);
|
||||||
|
errno_t errErr = freopen_s (&fileErr, "CONOUT$", "r+", stderr);
|
||||||
|
|
||||||
|
if (errOut != 0 || errErr != 0)
|
||||||
|
g_warning ("Failed to redirect streams to CONOUT$. stdout: %d, stderr: %d", errOut, errErr);
|
||||||
|
#endif
|
||||||
_flushall ();
|
_flushall ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue