aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-08-14 10:33:43 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-08-14 10:33:43 +0000
commit1af7a2c5229f34de9125bc030ef7e79d7a883471 (patch)
tree5773d1670da452c8647aaea54a66cae5a6a1c923 /tools
parente54e4d50d1f600ae2d2e589b4c0545ac39cfed8d (diff)
downloadupstream-1af7a2c5229f34de9125bc030ef7e79d7a883471.tar.gz
upstream-1af7a2c5229f34de9125bc030ef7e79d7a883471.tar.bz2
upstream-1af7a2c5229f34de9125bc030ef7e79d7a883471.zip
wrt350nv2-builder: don't use internal zlib macro OF() in ioapi.h, it breaks with new zlib releases
SVN-Revision: 33181
Diffstat (limited to 'tools')
-rw-r--r--tools/wrt350nv2-builder/Makefile1
-rw-r--r--tools/wrt350nv2-builder/src/ioapi.h16
2 files changed, 9 insertions, 8 deletions
diff --git a/tools/wrt350nv2-builder/Makefile b/tools/wrt350nv2-builder/Makefile
index da2bd6bc79..755f27dc60 100644
--- a/tools/wrt350nv2-builder/Makefile
+++ b/tools/wrt350nv2-builder/Makefile
@@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=wrt350nv2-builder
PKG_VERSION:=2.4
+PKG_REVISION:=2
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/${PKG_NAME}-$(PKG_VERSION)
diff --git a/tools/wrt350nv2-builder/src/ioapi.h b/tools/wrt350nv2-builder/src/ioapi.h
index 7d457baab3..5fa9786148 100644
--- a/tools/wrt350nv2-builder/src/ioapi.h
+++ b/tools/wrt350nv2-builder/src/ioapi.h
@@ -35,13 +35,13 @@
extern "C" {
#endif
-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
-typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
-typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
-typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+typedef voidpf (ZCALLBACK *open_file_func) (voidpf opaque, const char* filename, int mode);
+typedef uLong (ZCALLBACK *read_file_func) (voidpf opaque, voidpf stream, void* buf, uLong size);
+typedef uLong (ZCALLBACK *write_file_func) (voidpf opaque, voidpf stream, const void* buf, uLong size);
+typedef long (ZCALLBACK *tell_file_func) (voidpf opaque, voidpf stream);
+typedef long (ZCALLBACK *seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin);
+typedef int (ZCALLBACK *close_file_func) (voidpf opaque, voidpf stream);
+typedef int (ZCALLBACK *testerror_file_func) (voidpf opaque, voidpf stream);
typedef struct zlib_filefunc_def_s
{
@@ -57,7 +57,7 @@ typedef struct zlib_filefunc_def_s
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def);
#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))