diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c index 05182b65a9..e2e8f509b3 100644 --- a/app/core/gimp-utils.c +++ b/app/core/gimp-utils.c @@ -146,7 +146,9 @@ gimp_get_default_language (const gchar *category) { gchar *lang; gchar *p; +#ifndef G_OS_WIN32 gint cat = LC_CTYPE; +#endif if (! category) category = "LC_CTYPE"; diff --git a/app/errors.c b/app/errors.c index 3139ea24f1..d12be158c3 100644 --- a/app/errors.c +++ b/app/errors.c @@ -321,7 +321,9 @@ gimp_eek (const gchar *reason, ! the_errors_gimp->no_interface && backtrace_file) { +#ifndef G_OS_WIN32 FILE *fd; +#endif gboolean has_backtrace = TRUE; /* If GUI backtrace enabled (it is disabled by default), it diff --git a/app/main.c b/app/main.c index 7ce100ef0c..9514cb398a 100644 --- a/app/main.c +++ b/app/main.c @@ -555,6 +555,10 @@ main (int argc, GOptionGroup *gimp_group = NULL; gchar *backtrace_file = NULL; GError *error = NULL; +#ifdef G_OS_WIN32 + gchar *utf8_name; + wchar_t *name; +#endif #ifndef GIMP_CONSOLE_COMPILATION GKeyFile *flatpak_keyfile; #endif @@ -607,8 +611,8 @@ main (int argc, #ifdef G_OS_WIN32 /* Make Inno aware of gimp process avoiding broken install/unninstall */ - char *utf8_name = g_strdup_printf ("GIMP-%s", GIMP_MUTEX_VERSION); - wchar_t *name = g_utf8_to_utf16 (utf8_name, -1, NULL, NULL, NULL); + utf8_name = g_strdup_printf ("GIMP-%s", GIMP_MUTEX_VERSION); + name = g_utf8_to_utf16 (utf8_name, -1, NULL, NULL, NULL); CreateMutexW (NULL, FALSE, name); @@ -625,8 +629,10 @@ main (int argc, const gchar *install_dir; gchar *bin_dir; LPWSTR w_bin_dir; +#ifdef ENABLE_RELOCATABLE_RESOURCES size_t path_len; gchar *path; +#endif /* On Windows, set DLL search path to $INSTALLDIR/bin so that .exe * plug-ins processes in the plug-ins directory can find libgimp and diff --git a/modules/gimpinputdevicestore-dx.c b/modules/gimpinputdevicestore-dx.c index 82a926f05c..3adad9aa87 100644 --- a/modules/gimpinputdevicestore-dx.c +++ b/modules/gimpinputdevicestore-dx.c @@ -358,7 +358,7 @@ gimp_input_device_store_add (GimpInputDeviceStore *store, if (UuidToString (guid, &s) != S_OK) return FALSE; - guidstring = g_strdup (s); + guidstring = g_strdup ((char *) s); RpcStringFree (&s); if (FAILED ((hresult = IDirectInput8_CreateDevice (store->directinput8,