From 08ba94c652de75e746d3d4bf7bc44a4a48dbb321 Mon Sep 17 00:00:00 2001 From: Jacob Boerema Date: Tue, 17 May 2022 16:58:22 -0400 Subject: [PATCH] plug-ins: fix Windows build in UCRT environment The UCRT environment is a successor to the MINGW environment on Windows with a more modern C runtime library. Building under UCRT we get this error: ../../gimp/plug-ins/file-raw/file-darktable.c:420:7: error: function '__p__environ' is initialized like a variable" To fix this we use the relevant part of patch 6 from: https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-gimp (cherry picked from commit ef817dc452acefb86277cad54cbc10c5415a0620) --- plug-ins/file-raw/file-darktable.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plug-ins/file-raw/file-darktable.c b/plug-ins/file-raw/file-darktable.c index 6c5f5f6265..b5897c8e5c 100644 --- a/plug-ins/file-raw/file-darktable.c +++ b/plug-ins/file-raw/file-darktable.c @@ -401,7 +401,7 @@ load_image (const gchar *filename, if (debug_prints) { - gchar **environ = g_get_environ (); + gchar **environ_ = g_get_environ (); gint i; g_printf ("[%s] trying to call\n", __FILE__); @@ -410,9 +410,9 @@ load_image (const gchar *filename, g_printf ("\n"); g_printf ("## Environment ##\n"); - for (i = 0; environ[i]; i++) - g_printf ("- %s\n", environ[i]); - g_strfreev (environ) ; + for (i = 0; environ_[i]; i++) + g_printf ("- %s\n", environ_[i]); + g_strfreev (environ_) ; } if (g_spawn_sync (NULL,