summaryrefslogtreecommitdiff
path: root/libgphoto2/gphoto2-setting.c
diff options
context:
space:
mode:
authorMichael Fink <michael.fink@asamnet.de>2019-01-12 13:47:32 +0100
committerMichael Fink <michael.fink@asamnet.de>2019-01-12 13:47:32 +0100
commitf26a4b69cca2d5275a9c5a8d3a6091bd521a39c6 (patch)
treee7f22bf91ac2c17ad0f9ede5b130b8cc543f61f0 /libgphoto2/gphoto2-setting.c
parentd4e88ab06708ee197b0260faaeb1886b5f7694b2 (diff)
downloadlibgphoto2-f26a4b69cca2d5275a9c5a8d3a6091bd521a39c6.tar.gz
fixed including Win32 shlobj.h header when compiling using Visual Studio
Diffstat (limited to 'libgphoto2/gphoto2-setting.c')
-rw-r--r--libgphoto2/gphoto2-setting.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libgphoto2/gphoto2-setting.c b/libgphoto2/gphoto2-setting.c
index 69202e4ef..7410938eb 100644
--- a/libgphoto2/gphoto2-setting.c
+++ b/libgphoto2/gphoto2-setting.c
@@ -35,7 +35,10 @@
#include <gphoto2/gphoto2-port-portability.h>
#ifdef WIN32
+/* Win32 headers may use interface as a define; temporarily correct this */
+#define interface struct
#include <Shlobj.h>
+#undef interface
#endif
/**