Changeset 4f05dd9 in rtems


Ignore:
Timestamp:
Mar 18, 2011, 10:11:48 AM (9 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.11, master
Children:
3db30a68
Parents:
c29ecea5
Message:

Import from zlib-1.2.5

Location:
cpukit/zlib
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • cpukit/zlib/ChangeLog

    rc29ecea5 r4f05dd9  
    11
    22                ChangeLog file for zlib
     3
     4Changes in 1.2.5 (19 Apr 2010)
     5- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
     6- Default to libdir as sharedlibdir in configure [Nieder]
     7- Update copyright dates on modified source files
     8- Update trees.c to be able to generate modified trees.h
     9- Exit configure for MinGW, suggesting win32/Makefile.gcc
     10
     11Changes in 1.2.4.5 (18 Apr 2010)
     12- Set sharedlibdir in configure [Torok]
     13- Set LDFLAGS in Makefile.in [Bar-Lev]
     14- Avoid mkdir objs race condition in Makefile.in [Bowler]
     15- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
     16- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
     17- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
     18
     19Changes in 1.2.4.4 (18 Apr 2010)
     20- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]
     21- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
     22- Try to use bash or ksh regardless of functionality of /bin/sh
     23- Fix configure incompatibility with NetBSD sh
     24- Remove attempt to run under bash or ksh since have better NetBSD fix
     25- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
     26- Add diagnostic messages when using CROSS_PREFIX in configure
     27- Added --sharedlibdir option to configure [Weigelt]
     28- Use hidden visibility attribute when available [Frysinger]
     29
     30Changes in 1.2.4.3 (10 Apr 2010)
     31- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
     32- Use CROSS_PREFIX for nm [Bar-Lev]
     33- Assume _LARGEFILE64_SOURCE defined is equivalent to true
     34- Avoid use of undefined symbols in #if with && and ||
     35- Make *64 prototypes in gzguts.h consistent with functions
     36- Add -shared load option for MinGW in configure [Bowler]
     37- Move z_off64_t to public interface, use instead of off64_t
     38- Remove ! from shell test in configure (not portable to Solaris)
     39- Change +0 macro tests to -0 for possibly increased portability
     40
     41Changes in 1.2.4.2 (9 Apr 2010)
     42- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
     43- Really provide prototypes for *64 functions when building without LFS
     44- Only define unlink() in minigzip.c if unistd.h not included
     45- Update README to point to contrib/vstudio project files
     46- Move projects/vc6 to old/ and remove projects/
     47- Include stdlib.h in minigzip.c for setmode() definition under WinCE
     48- Clean up assembler builds in win32/Makefile.msc [Rowe]
     49- Include sys/types.h for Microsoft for off_t definition
     50- Fix memory leak on error in gz_open()
     51- Symbolize nm as $NM in configure [Weigelt]
     52- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt]
     53- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
     54- Fix bug in gzeof() to take into account unused input data
     55- Avoid initialization of structures with variables in puff.c
     56- Updated win32/README-WIN32.txt [Rowe]
     57
     58Changes in 1.2.4.1 (28 Mar 2010)
     59- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]
     60- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]
     61- Restore "for debugging" comment on sprintf() in gzlib.c
     62- Remove fdopen for MVS from gzguts.h
     63- Put new README-WIN32.txt in win32 [Rowe]
     64- Add check for shell to configure and invoke another shell if needed
     65- Fix big fat stinking bug in gzseek() on uncompressed files
     66- Remove vestigial F_OPEN64 define in zutil.h
     67- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
     68- Avoid errors on non-LFS systems when applications define LFS macros
     69- Set EXE to ".exe" in configure for MINGW [Kahle]
     70- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]
     71- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]
     72- Add DLL install in win32/makefile.gcc [Bar-Lev]
     73- Allow Linux* or linux* from uname in configure [Bar-Lev]
     74- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]
     75- Add cross-compilation prefixes to configure [Bar-Lev]
     76- Match type exactly in gz_load() invocation in gzread.c
     77- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
     78- Provide prototypes for *64 functions when building zlib without LFS
     79- Don't use -lc when linking shared library on MinGW
     80- Remove errno.h check in configure and vestigial errno code in zutil.h
    381
    482Changes in 1.2.4 (14 Mar 2010)
     
    100178- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]
    101179- Update zlib.map [Brown]
    102 - Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Tšršk]
     180- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]
    103181- Apply various fixes to CMakeLists.txt [Lowman]
    104182- Add checks on len in gzread() and gzwrite()
  • cpukit/zlib/Makefile.in

    rc29ecea5 r4f05dd9  
    2626
    2727SFLAGS=-O
    28 
    29 LDFLAGS=-L. libz.a
     28LDFLAGS=
     29TEST_LDFLAGS=-L. libz.a
    3030LDSHARED=$(CC)
    3131CPP=$(CC) -E
     
    3333STATICLIB=libz.a
    3434SHAREDLIB=libz.so
    35 SHAREDLIBV=libz.so.1.2.4
     35SHAREDLIBV=libz.so.1.2.5
    3636SHAREDLIBM=libz.so.1
    37 LIBS=$(STATICLIB) $(SHAREDLIB) $(SHAREDLIBV)
     37LIBS=$(STATICLIB) $(SHAREDLIBV)
    3838
    3939AR=ar rc
    4040RANLIB=ranlib
     41LDCONFIG=ldconfig
     42LDSHAREDLIBC=-lc
    4143TAR=tar
    4244SHELL=/bin/sh
     
    4648exec_prefix = ${prefix}
    4749libdir = ${exec_prefix}/lib
     50sharedlibdir = ${libdir}
    4851includedir = ${prefix}/include
    4952mandir = ${prefix}/share/man
     
    130133
    131134.c.lo:
    132         -@if [ ! -d objs ]; then mkdir objs; fi
     135        -@mkdir objs 2>/dev/null || test -d objs
    133136        $(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
    134137        -@mv objs/$*.o $@
    135138
    136139$(SHAREDLIBV): $(PIC_OBJS)
    137         $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) -lc
     140        $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
    138141        rm -f $(SHAREDLIB) $(SHAREDLIBM)
    139142        ln -s $@ $(SHAREDLIB)
     
    142145
    143146example$(EXE): example.o $(STATICLIB)
    144         $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
     147        $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
    145148
    146149minigzip$(EXE): minigzip.o $(STATICLIB)
    147         $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
     150        $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
    148151
    149152examplesh$(EXE): example.o $(SHAREDLIBV)
     
    154157
    155158example64$(EXE): example64.o $(STATICLIB)
    156         $(CC) $(CFLAGS) -o $@ example64.o $(LDFLAGS)
     159        $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
    157160
    158161minigzip64$(EXE): minigzip64.o $(STATICLIB)
    159         $(CC) $(CFLAGS) -o $@ minigzip64.o $(LDFLAGS)
     162        $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
    160163
    161164install-libs: $(LIBS)
    162165        -@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
    163166        -@if [ ! -d $(DESTDIR)$(libdir)       ]; then mkdir -p $(DESTDIR)$(libdir); fi
     167        -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
    164168        -@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
    165169        -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
    166         cp $(LIBS) $(DESTDIR)$(libdir)
     170        cp $(STATICLIB) $(DESTDIR)$(libdir)
     171        cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
    167172        cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
    168173        -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
    169         -@cd $(DESTDIR)$(libdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
     174        -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
    170175          chmod 755 $(SHAREDLIBV); \
    171176          rm -f $(SHAREDLIB) $(SHAREDLIBM); \
    172177          ln -s $(SHAREDLIBV) $(SHAREDLIB); \
    173178          ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
    174           (ldconfig || true)  >/dev/null 2>&1; \
     179          ($(LDCONFIG) || true)  >/dev/null 2>&1; \
    175180        fi
    176181        cp zlib.3 $(DESTDIR)$(man3dir)
  • cpukit/zlib/README

    rc29ecea5 r4f05dd9  
    11ZLIB DATA COMPRESSION LIBRARY
    22
    3 zlib 1.2.4 is a general purpose data compression library.  All the code is
     3zlib 1.2.5 is a general purpose data compression library.  All the code is
    44thread safe.  The data format used by the zlib library is described by RFCs
    55(Request for Comments) 1950 to 1952 in the files
     
    1717the top of Makefile.in.  In short "./configure; make test", and if that goes
    1818well, "make install" should work for most flavors of Unix.  For Windows, use one
    19 of the special makefiles in win32/ or projects/ .  For VMS, use make_vms.com.
     19of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
     20make_vms.com.
    2021
    2122Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
     
    3132http://marknelson.us/1997/01/01/zlib-engine/ .
    3233
    33 The changes made in version 1.2.4 are documented in the file ChangeLog.
     34The changes made in version 1.2.5 are documented in the file ChangeLog.
    3435
    3536Unsupported third party contributions are provided in directory contrib/ .
  • cpukit/zlib/configure

    rc29ecea5 r4f05dd9  
    1414# an error.
    1515
     16if [ -n "${CHOST}" ]; then
     17    uname="$(echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/')"
     18    CROSS_PREFIX="${CHOST}-"
     19fi
     20
    1621STATICLIB=libz.a
    1722LDFLAGS="${LDFLAGS} -L. ${STATICLIB}"
     
    2025VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
    2126VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
    22 AR=${AR-"ar"}
     27if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
     28    AR=${AR-"${CROSS_PREFIX}ar"}
     29    test -n "${CROSS_PREFIX}" && echo Using ${AR}
     30else
     31    AR=${AR-"ar"}
     32    test -n "${CROSS_PREFIX}" && echo Using ${AR}
     33fi
    2334AR_RC="${AR} rc"
    24 RANLIB=${RANLIB-"ranlib"}
     35if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then
     36    RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}
     37    test -n "${CROSS_PREFIX}" && echo Using ${RANLIB}
     38else
     39    RANLIB=${RANLIB-"ranlib"}
     40fi
     41if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then
     42    NM=${NM-"${CROSS_PREFIX}nm"}
     43    test -n "${CROSS_PREFIX}" && echo Using ${NM}
     44else
     45    NM=${NM-"nm"}
     46fi
     47LDCONFIG=${LDCONFIG-"ldconfig"}
     48LDSHAREDLIBC="${LDSHAREDLIBC--lc}"
    2549prefix=${prefix-/usr/local}
    2650exec_prefix=${exec_prefix-'${prefix}'}
    2751libdir=${libdir-'${exec_prefix}/lib'}
     52sharedlibdir=${sharedlibdir-'${libdir}'}
    2853includedir=${includedir-'${prefix}/include'}
    2954mandir=${mandir-'${prefix}/share/man'}
     
    4267      echo 'usage:'
    4368      echo '  configure [--zprefix] [--prefix=PREFIX]  [--eprefix=EXPREFIX]'
    44       echo '    [--static] [--64] [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'
     69      echo '    [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]'
     70      echo '    [--includedir=INCLUDEDIR]'
    4571        exit 0 ;;
    46     -p*=* | --prefix=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
    47     -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
    48     -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
    49     -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;;
    50     -u*=* | --uname=*) uname=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;;
     72    -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
     73    -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
     74    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;;
     75    --sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;;
     76    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;;
     77    -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;;
    5178    -p* | --prefix) prefix="$2"; shift; shift ;;
    5279    -e* | --eprefix) exec_prefix="$2"; shift; shift ;;
     
    6996EOF
    7097
    71 test -z "$CC" && echo Checking for gcc...
    72 cc=${CC-gcc}
     98test -z "$CC" && echo Checking for ${CROSS_PREFIX}gcc...
     99cc=${CC-${CROSS_PREFIX}gcc}
    73100cflags=${CFLAGS-"-O3"}
    74101# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
     
    79106if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
    80107  CC="$cc"
    81   SFLAGS="${CFLAGS-"-O3"} -fPIC"
    82   CFLAGS="${CFLAGS-"-O3"}"
     108  SFLAGS="${CFLAGS--O3} -fPIC"
     109  CFLAGS="${CFLAGS--O3}"
    83110  if test $build64 -eq 1; then
    84111    CFLAGS="${CFLAGS} -m64"
     
    92119  fi
    93120  case "$uname" in
    94   Linux | linux | GNU | GNU/* | *BSD | DragonFly) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
    95   CYGWIN* | Cygwin* | cygwin* | OS/2* )
    96              EXE='.exe' ;;
     121  Linux* | linux* | GNU | GNU/* | *BSD | DragonFly) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
     122  CYGWIN* | Cygwin* | cygwin* | OS/2*)
     123        EXE='.exe' ;;
     124  MINGW*|mingw*)
     125# temporary bypass
     126        rm -f $test.[co] $test $test$shared_ext
     127        echo "Please use win32/Makefile.gcc instead."
     128        exit 1
     129        LDSHARED=${LDSHARED-"$cc -shared"}
     130        LDSHAREDLIBC=""
     131        EXE='.exe' ;;
    97132  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
    98133         # (alain.bonnefoy@icbt.com)
     
    118153  # find system name and corresponding cc options
    119154  CC=${CC-cc}
     155  gcc=0
    120156  if test -z "$uname"; then
    121157    uname=`(uname -sr || echo unknown) 2>/dev/null`
     
    475511fi
    476512
    477 cat >$test.c <<EOF
    478 #include <errno.h>
    479 int main() { return 0; }
    480 EOF
    481 if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
    482   echo "Checking for errno.h... Yes."
    483 else
    484   echo "Checking for errno.h... No."
    485   CFLAGS="$CFLAGS -DNO_ERRNO_H"
    486   SFLAGS="$SFLAGS -DNO_ERRNO_H"
     513if test "$gcc" -eq 1; then
     514  cat > $test.c <<EOF
     515#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33)
     516#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
     517#else
     518#  define ZLIB_INTERNAL
     519#endif
     520int ZLIB_INTERNAL foo;
     521int main()
     522{
     523  return 0;
     524}
     525EOF
     526  if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
     527    echo "Checking for attribute(visibility) support... Yes."
     528  else
     529    CFLAGS="$CFLAGS -DNO_VIZ"
     530    SFLAGS="$SFLAGS -DNO_VIZ"
     531    echo "Checking for attribute(visibility) support... No."
     532  fi
    487533fi
    488534
     
    490536case $CFLAGS in
    491537  *ASMV*)
    492     if test "`nm $test.o | grep _hello`" = ""; then
     538    if test "`$NM $test.o | grep _hello`" = ""; then
    493539      CPP="$CPP -DNO_UNDERLINE"
    494540      echo Checking for underline in external names... No.
     
    514560/^AR *=/s#=.*#=$AR_RC#
    515561/^RANLIB *=/s#=.*#=$RANLIB#
     562/^LDCONFIG *=/s#=.*#=$LDCONFIG#
     563/^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC#
    516564/^EXE *=/s#=.*#=$EXE#
    517565/^prefix *=/s#=.*#=$prefix#
    518566/^exec_prefix *=/s#=.*#=$exec_prefix#
    519567/^libdir *=/s#=.*#=$libdir#
     568/^sharedlibdir *=/s#=.*#=$sharedlibdir#
    520569/^includedir *=/s#=.*#=$includedir#
    521570/^mandir *=/s#=.*#=$mandir#
     
    539588/^exec_prefix *=/s#=.*#=$exec_prefix#
    540589/^libdir *=/s#=.*#=$libdir#
     590/^sharedlibdir *=/s#=.*#=$sharedlibdir#
    541591/^includedir *=/s#=.*#=$includedir#
    542592/^mandir *=/s#=.*#=$mandir#
  • cpukit/zlib/contrib/delphi/ZLib.pas

    rc29ecea5 r4f05dd9  
    153153
    154154const
    155   zlib_version = '1.2.4';
     155  zlib_version = '1.2.5';
    156156
    157157type
  • cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs

    rc29ecea5 r4f05dd9  
    157157        {
    158158            Info info = new Info();
    159             Assert.AreEqual("1.2.4", Info.Version);
     159            Assert.AreEqual("1.2.5", Info.Version);
    160160            Assert.AreEqual(32, info.SizeOfUInt);
    161161            Assert.AreEqual(32, info.SizeOfULong);
  • cpukit/zlib/contrib/infback9/inftree9.c

    rc29ecea5 r4f05dd9  
    1010
    1111const char inflate9_copyright[] =
    12    " inflate9 1.2.4 Copyright 1995-2010 Mark Adler ";
     12   " inflate9 1.2.5 Copyright 1995-2010 Mark Adler ";
    1313/*
    1414  If you use the zlib library in a product, an acknowledgment is welcome
     
    6565        128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
    6666        130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
    67         133, 133, 133, 133, 144, 64, 195};
     67        133, 133, 133, 133, 144, 73, 195};
    6868    static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
    6969        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
  • cpukit/zlib/contrib/pascal/zlibpas.pas

    rc29ecea5 r4f05dd9  
    1111
    1212const
    13   ZLIB_VERSION = '1.2.4';
     13  ZLIB_VERSION = '1.2.5';
    1414
    1515type
  • cpukit/zlib/contrib/vstudio/vc10/zlib.rc

    rc29ecea5 r4f05dd9  
    33#define IDR_VERSION1  1
    44IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
    5   FILEVERSION    1,2,4,0
    6   PRODUCTVERSION 1,2,4,0
     5  FILEVERSION    1,2,5,0
     6  PRODUCTVERSION 1,2,5,0
    77  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
    88  FILEFLAGS     0
     
    1818    BEGIN
    1919      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20       VALUE "FileVersion",      "1.2.4.0\0"
     20      VALUE "FileVersion",      "1.2.5\0"
    2121      VALUE "InternalName",     "zlib\0"
    2222      VALUE "OriginalFilename", "zlib.dll\0"
  • cpukit/zlib/contrib/vstudio/vc9/zlib.rc

    rc29ecea5 r4f05dd9  
    33#define IDR_VERSION1  1
    44IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
    5   FILEVERSION    1,2,4,0
    6   PRODUCTVERSION 1,2,4,0
     5  FILEVERSION    1,2,5,0
     6  PRODUCTVERSION 1,2,5,0
    77  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
    88  FILEFLAGS     0
     
    1818    BEGIN
    1919      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20       VALUE "FileVersion",      "1.2.4.0\0"
     20      VALUE "FileVersion",      "1.2.5\0"
    2121      VALUE "InternalName",     "zlib\0"
    2222      VALUE "OriginalFilename", "zlib.dll\0"
  • cpukit/zlib/deflate.c

    rc29ecea5 r4f05dd9  
    5353
    5454const char deflate_copyright[] =
    55    " deflate 1.2.4 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
     55   " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
    5656/*
    5757  If you use the zlib library in a product, an acknowledgment is welcome
  • cpukit/zlib/inftrees.c

    rc29ecea5 r4f05dd9  
    1010
    1111const char inflate_copyright[] =
    12    " inflate 1.2.4 Copyright 1995-2010 Mark Adler ";
     12   " inflate 1.2.5 Copyright 1995-2010 Mark Adler ";
    1313/*
    1414  If you use the zlib library in a product, an acknowledgment is welcome
     
    3030   longest code or if it is less than the shortest code.
    3131 */
    32 int inflate_table(type, lens, codes, table, bits, work)
     32int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
    3333codetype type;
    3434unsigned short FAR *lens;
     
    6363    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
    6464        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
    65         19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 64, 195};
     65        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195};
    6666    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
    6767        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
  • cpukit/zlib/qnx/package.qpg

    rc29ecea5 r4f05dd9  
    2626         <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
    2727         <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
    28          <QPG:Add file="../libz.so.1.2.4" install="/opt/lib/" user="root:bin" permission="644"/>
    29          <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.4"/>
    30          <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.4"/>
    31          <QPG:Add file="../libz.so.1.2.4" install="/opt/lib/" component="slib"/>
     28         <QPG:Add file="../libz.so.1.2.5" install="/opt/lib/" user="root:bin" permission="644"/>
     29         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.5"/>
     30         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.5"/>
     31         <QPG:Add file="../libz.so.1.2.5" install="/opt/lib/" component="slib"/>
    3232      </QPG:Files>
    3333
     
    6464
    6565            <QPM:ReleaseDescription>
    66                <QPM:ReleaseVersion>1.2.4</QPM:ReleaseVersion>
     66               <QPM:ReleaseVersion>1.2.5</QPM:ReleaseVersion>
    6767               <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
    6868               <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
  • cpukit/zlib/treebuild.xml

    rc29ecea5 r4f05dd9  
    11<?xml version="1.0" ?>
    2 <package name="zlib" version="1.2.4">
    3     <library name="zlib" dlversion="1.2.4" dlname="z">
     2<package name="zlib" version="1.2.5">
     3    <library name="zlib" dlversion="1.2.5" dlname="z">
    44        <property name="description"> zip compression library </property>
    55        <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
  • cpukit/zlib/zlib.3

    rc29ecea5 r4f05dd9  
    1 .TH ZLIB 3 "14 March 2010"
     1.TH ZLIB 3 "19 Apr 2010"
    22.SH NAME
    33zlib \- compression/decompression library
     
    126126or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
    127127.SH AUTHORS
    128 Version 1.2.4
     128Version 1.2.5
    129129Copyright (C) 1995-2010 Jean-loup Gailly (jloup@gzip.org)
    130130and Mark Adler (madler@alumni.caltech.edu).
  • cpukit/zlib/zlib.h

    rc29ecea5 r4f05dd9  
    11/* zlib.h -- interface of the 'zlib' general purpose compression library
    2   version 1.2.4, Mar 14th, 2010
     2  version 1.2.5, April 19th, 2010
    33
    44  Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
     
    3838#endif
    3939
    40 #define ZLIB_VERSION "1.2.4"
    41 #define ZLIB_VERNUM 0x1240
     40#define ZLIB_VERSION "1.2.5"
     41#define ZLIB_VERNUM 0x1250
    4242#define ZLIB_VER_MAJOR 1
    4343#define ZLIB_VER_MINOR 2
    44 #define ZLIB_VER_REVISION 4
     44#define ZLIB_VER_REVISION 5
    4545#define ZLIB_VER_SUBREVISION 0
    4646
     
    15571557                                            ZLIB_VERSION, sizeof(z_stream))
    15581558
    1559 #ifdef _LARGEFILE64_SOURCE
     1559/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
     1560 * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
     1561 * both are true, the application gets the *64 functions, and the regular
     1562 * functions are changed to 64 bits) -- in case these are set on systems
     1563 * without large file support, _LFS64_LARGEFILE must also be true
     1564 */
     1565#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
    15601566   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
    1561    ZEXTERN off64_t ZEXPORT gzseek64 OF((gzFile, off64_t, int));
    1562    ZEXTERN off64_t ZEXPORT gztell64 OF((gzFile));
    1563    ZEXTERN off64_t ZEXPORT gzoffset64 OF((gzFile));
    1564    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, off64_t));
    1565    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off64_t));
     1567   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
     1568   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
     1569   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
     1570   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
     1571   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
    15661572#endif
    15671573
    1568 #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS == 64
     1574#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
    15691575#  define gzopen gzopen64
    15701576#  define gzseek gzseek64
     
    15731579#  define adler32_combine adler32_combine64
    15741580#  define crc32_combine crc32_combine64
    1575 #  ifndef _LARGEFILE64_SOURCE
     1581#  ifdef _LARGEFILE64_SOURCE
    15761582     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
    1577      ZEXTERN off_t ZEXPORT gzseek64 OF((gzFile, off_t, int));
    1578      ZEXTERN off_t ZEXPORT gztell64 OF((gzFile));
    1579      ZEXTERN off_t ZEXPORT gzoffset64 OF((gzFile));
    1580      ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, off_t));
    1581      ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off_t));
     1583     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
     1584     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
     1585     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
     1586     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
     1587     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
    15821588#  endif
    15831589#else
     
    15901596#endif
    15911597
     1598/* hack for buggy compilers */
    15921599#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
    1593     struct internal_state {int dummy;}; /* hack for buggy compilers */
     1600    struct internal_state {int dummy;};
    15941601#endif
    15951602
     1603/* undocumented functions */
    15961604ZEXTERN const char   * ZEXPORT zError           OF((int));
    15971605ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
Note: See TracChangeset for help on using the changeset viewer.