commit cc23ad6aeac18de8be090af08450270eb10d1f09
parent 8edcafcf1130d11bb48d8a589a8001a985da4528
Author: Jiri Slachta <slachta@cesnet.cz>
Date: Fri, 20 May 2016 13:19:11 +0200
Merge pull request #2714 from jow-/tiff-ftell-fix
tiff: fix wrong declaration of ftell() compat macro
Diffstat:
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tiff
PKG_VERSION:=4.0.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://download.osgeo.org/libtiff
diff --git a/libs/tiff/patches/005-fix-ftell-macro.patch b/libs/tiff/patches/005-fix-ftell-macro.patch
@@ -0,0 +1,11 @@
+--- a/libtiff/tiffiop.h
++++ b/libtiff/tiffiop.h
+@@ -284,7 +284,7 @@ struct tiff {
+ */
+ #if defined(HAVE_FSEEKO)
+ # define fseek(stream,offset,whence) fseeko(stream,offset,whence)
+-# define ftell(stream,offset,whence) ftello(stream,offset,whence)
++# define ftell(stream) ftello(stream)
+ #endif
+ #endif
+ #if defined(__WIN32__) && \