diff options
authorFrederik Gladhorn <>2013-08-14 12:38:11 +0200
committerFrederik Gladhorn <>2013-08-14 12:42:42 +0200
commit82b7b9d3dc9e1eeff305a3e53e618d3413be123d (patch)
parentab19bcfffc5b5074f9ff68903abeac1c14b576ac (diff)
parent9baeb56ceac51755e69589536a49c6f4cfefa4b6 (diff)
Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1
The inline keyword needs to be defined to __inline for MSVC when compiling C files. The patch removing the redefinition of inline does not work with the updated library, instead we resurrect the ifdef for MSVC only. Conflicts: src/3rdparty/libtiff/libtiff/tif_config.h Change-Id: I22bbaf3627fdb4f3dc60c9cd0f8d3282efc5bd2c
1 files changed, 5 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h
index d60bd8e..64ab64b 100644
--- a/src/3rdparty/libtiff/libtiff/tif_config.h
+++ b/src/3rdparty/libtiff/libtiff/tif_config.h
@@ -412,9 +412,12 @@
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
+#if defined(Q_CC_MSVC)
#ifndef __cplusplus
-#undef inline
-#define inline
+# ifndef inline
+# define inline __inline
+# endif
/* Define to `long int' if <sys/types.h> does not define. */