Merge remote-tracking branch 'origin/stable' into dev v5.2.0-alpha1
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 14 Aug 2013 10:38:11 +0000 (12:38 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 14 Aug 2013 10:42:42 +0000 (12:42 +0200)
commit82b7b9d3dc9e1eeff305a3e53e618d3413be123d
tree7ea8c7c2d1e2b6166b459293d036c90522c02edb
parentab19bcfffc5b5074f9ff68903abeac1c14b576ac
parent9baeb56ceac51755e69589536a49c6f4cfefa4b6
Merge remote-tracking branch 'origin/stable' into dev

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
src/3rdparty/libtiff/libtiff/tif_config.h