[gimp] plug-ins: Fix finding raw loaders on Win/OSX
- From: Tobias Ellinghaus <et src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: Fix finding raw loaders on Win/OSX
- Date: Mon, 4 Sep 2017 10:02:09 +0000 (UTC)
commit 855f2f1cbed972e82ed2e5fb9c143001cd858687
Author: Tobias Ellinghaus <me houz org>
Date: Mon Sep 4 11:59:33 2017 +0200
plug-ins: Fix finding raw loaders on Win/OSX
Without including gdk.h the #defines to determine the system are not
available, resulting in no platform specific code being compiled in.
plug-ins/file-raw/file-raw-utils.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/plug-ins/file-raw/file-raw-utils.c b/plug-ins/file-raw/file-raw-utils.c
index 117cb42..23ab620 100644
--- a/plug-ins/file-raw/file-raw-utils.c
+++ b/plug-ins/file-raw/file-raw-utils.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <gdk/gdk.h>
+
#ifdef GDK_WINDOWING_QUARTZ
#include <CoreServices/CoreServices.h>
#endif
@@ -104,7 +106,7 @@ file_raw_get_executable_path (const gchar *main_executable,
/* else, app bundle was not found, try path search as last resort. */
}
#elif defined (GDK_WINDOWING_WIN32)
- if (registry_key_base)
+ if (win32_registry_key_base)
{
/* Look for the application in the Windows registry. */
char *registry_key;
@@ -113,10 +115,9 @@ file_raw_get_executable_path (const gchar *main_executable,
long status;
if (suffix)
- registry_key = g_strconcat (registry_key_base, suffix, ".exe", NULL);
+ registry_key = g_strconcat (win32_registry_key_base, suffix, ".exe", NULL);
else
- registry_key = g_strconcat (registry_key_base, ".exe", NULL);
-
+ registry_key = g_strconcat (win32_registry_key_base, ".exe", NULL);
status = RegGetValue (HKEY_LOCAL_MACHINE, registry_key, "", RRF_RT_ANY,
NULL, (PVOID)&path, &buffer_size);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]