From 5e8de52a18cc216a9acc4dc4c384438462d04141 Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 15 Sep 2014 16:15:00 +0000 Subject: [PATCH] Renamed to z1.library. Renaming to z.library isn't really an option, because we'd be forced to choose between compatibility with either the AmigaOS 3.x or MorphOS libraries of the same name (which are incompatible with each other). git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49636 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/libs/z/mmakefile.src | 2 +- workbench/libs/z/{z_au.conf => z1.conf} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename workbench/libs/z/{z_au.conf => z1.conf} (97%) diff --git a/workbench/libs/z/mmakefile.src b/workbench/libs/z/mmakefile.src index 06d713b224..91c50917b6 100644 --- a/workbench/libs/z/mmakefile.src +++ b/workbench/libs/z/mmakefile.src @@ -15,7 +15,7 @@ FILES := adler32 crc32 deflate infback inffast inflate inftrees trees \ USER_CFLAGS := -DSTDC -DAMIGA -DZ_HAVE_UNISTD_H %build_module mmake=workbench-libs-z \ - modname=z_au modtype=library \ + modname=z1 modtype=library \ files="$(FILES)" linklibname=z diff --git a/workbench/libs/z/z_au.conf b/workbench/libs/z/z1.conf similarity index 97% rename from workbench/libs/z/z_au.conf rename to workbench/libs/z/z1.conf index ca093d7f55..a06b3fb32c 100644 --- a/workbench/libs/z/z_au.conf +++ b/workbench/libs/z/z1.conf @@ -1,8 +1,8 @@ ##begin config -basename Z -version 3.1 -date 16.06.2012 -copyright Copyright (C) 1995-2012 Mark Adler, Jean-loup Gailly, 2012 The AROS Development Team +basename Z1 +version 1.1 +date 15.9.2014 +copyright Copyright (C) 1995-2012 Mark Adler, Jean-loup Gailly, 2012-2014 The AROS Development Team options pertaskbase rellib posixc rellib stdc @@ -64,7 +64,7 @@ long inflateMark(z_streamp strm) uLong adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2) uLong crc32_combine64(uLong crc2, uLong d0arg, z_off64_t len2) int inflateUndermine(z_streamp strm, int subvert) -.version 3 +.skip 17 gzFile gzopen(const char *path, const char *mode) int gzclose(gzFile file) int gzclose_r(gzFile file) -- 2.11.4.GIT