diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 12:38:11 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 12:42:42 +0200 |
| commit | 82b7b9d3dc9e1eeff305a3e53e618d3413be123d (patch) | |
| tree | 7ea8c7c2d1e2b6166b459293d036c90522c02edb /src/3rdparty/libtiff/libtiff/tif_win32.c | |
| parent | ab19bcfffc5b5074f9ff68903abeac1c14b576ac (diff) | |
| parent | 9baeb56ceac51755e69589536a49c6f4cfefa4b6 (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
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_win32.c')
0 files changed, 0 insertions, 0 deletions