Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

* src/gzip/adler32.c, src/gzip/infblock.c, src/gzip/inflate.c,

Browse Source 
src/gzip/inftrees.c, src/gzip/zconf.h, src/gzip/zlib.h,
        src/gzip/zutil.h: updates to allow compilation without compiler
        warnings with LCC-Win32

        * include/freetype/freetype.h, docs/VERSION.DLL,
        builds/unix/configure.ac: updates for the upcoming 2.1.4 release
BRANCH-2-1-5
David Turner 22 years ago
parent 61fe2101d9
commit 3456045399
11 changed files with 46 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      ChangeLog
  2. 2
      builds/unix/configure.ac
  3. 9
      docs/VERSION.DLL
  4. 2
      include/freetype/freetype.h
  5. 2
      src/gzip/adler32.c
  6. 3
      src/gzip/infblock.c
  7. 8
      src/gzip/inflate.c
  8. 3
      src/gzip/inftrees.c
  9. 27
      src/gzip/zconf.h
  10. 18
      src/gzip/zlib.h
  11. 2
      src/gzip/zutil.h

3
ChangeLog
Unescape View File

@ -5,6 +5,9 @@
src/gzip/zutil.h: updates to allow compilation without compiler
warnings with LCC-Win32
* include/freetype/freetype.h, docs/VERSION.DLL,
builds/unix/configure.ac: updates for the upcoming 2.1.4 release
2002-12-23 Anthony Fok <anthony@thizlinux.com>
* builds/unix/configure.ac, builds/unix/unix-cc.in,

2
builds/unix/configure.ac
Unescape View File

@ -10,7 +10,7 @@ dnl configuration file -- stay in 8.3 limit
AC_CONFIG_HEADER(ftconfig.h:ftconfig.in)
dnl Don't forget to update VERSION.DLL!
version_info='9:2:3'
version_info='9:3:3'
AC_SUBST(version_info)
ft_version=`echo $version_info | tr : .`
AC_SUBST(ft_version)

9
docs/VERSION.DLL
Unescape View File

@ -13,10 +13,10 @@ For each new public release of FreeType 2, there are generally *three*
distinct "version" numbers to consider:
* the official FT2 release number, like 2.0.9, or 2.1.3
* the libtool (and Unix) specific version number, like "9.2.3". This
is what "freetype-config --version" will return
* the platform-specific shared object number, used for example when
the library is installed as "/usr/lib/libfreetype.so.6.3.2"
@ -35,10 +35,10 @@ macros defined in FT_FREETYPE_H:
- FREETYPE_MINOR : minor release number
- FREETYPE_PATCH : patch release number
see below for some Autoconf fragment to
see below for some Autoconf fragment to
the release number is also available at *runtime* through the
the release number is also available at *runtime* through the
"FT_Library_Version" API. Unfortunately, this one wasn't available or
working correctly before the 2.1.3 official release !!
@ -51,6 +51,7 @@ found on _most_ systems, but not all of them:
release libtool so
-------------------------------------
2.1.4 9.3.3 6.3.3
2.1.3 9.2.3 6.3.2
2.1.2 9.1.3 6.3.1
2.1.1 ? ?

2
include/freetype/freetype.h
Unescape View File

@ -35,7 +35,7 @@
/* */
#define FREETYPE_MAJOR 2
#define FREETYPE_MINOR 1
#define FREETYPE_PATCH 3
#define FREETYPE_PATCH 4
#include <ft2build.h>

2
src/gzip/adler32.c
Unescape View File

@ -18,7 +18,7 @@
#define DO16(buf) DO8(buf,0); DO8(buf,8);
/* ========================================================================= */
ZEXTERNDEF uLong ZEXPORT adler32(adler, buf, len)
ZEXPORT(uLong) adler32(adler, buf, len)
uLong adler;
const Bytef *buf;
uInt len;

3
src/gzip/infblock.c
Unescape View File

@ -365,6 +365,9 @@ int r;
r = Z_STREAM_ERROR;
LEAVE
}
#ifdef NEED_DUMMY_RETURN
return 0;
#endif
}

8
src/gzip/inflate.c
Unescape View File

@ -51,7 +51,7 @@ struct internal_state {
};
int ZEXPORT inflateReset(z)
ZEXPORT(int) inflateReset(z)
z_streamp z;
{
if (z == Z_NULL || z->state == Z_NULL)
@ -65,7 +65,7 @@ z_streamp z;
}
int ZEXPORT inflateEnd(z)
ZEXPORT(int) inflateEnd(z)
z_streamp z;
{
if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL)
@ -79,7 +79,7 @@ z_streamp z;
}
int ZEXPORT inflateInit2_(z, w, version, stream_size)
ZEXPORT(int) inflateInit2_(z, w, version, stream_size)
z_streamp z;
int w;
const char *version;
@ -144,7 +144,7 @@ int stream_size;
#define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
int ZEXPORT inflate(z, f)
ZEXPORT(int) inflate(z, f)
z_streamp z;
int f;
{

3
src/gzip/inftrees.c
Unescape View File

@ -10,8 +10,11 @@
# define BUILDFIXED /* non ANSI compilers may not accept inffixed.h */
#endif
#if 0
local const char inflate_copyright[] =
" inflate 1.1.4 Copyright 1995-2002 Mark Adler ";
#endif
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot

27
src/gzip/zconf.h
Unescape View File

@ -91,11 +91,14 @@
# define NO_DUMMY_DECL
#endif
/* Old Borland C incorrectly complains about missing returns: */
/* Old Borland C and LCC incorrectly complains about missing returns: */
#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
# define NEED_DUMMY_RETURN
#endif
#if defined(__LCC__)
# define NEED_DUMMY_RETURN
#endif
/* Maximum value for memLevel in deflateInit2 */
#ifndef MAX_MEM_LEVEL
@ -167,22 +170,22 @@
# undef FAR
# endif
# include <windows.h>
# define ZEXPORT WINAPI
# define ZEXPORT(x) x WINAPI
# ifdef WIN32
# define ZEXPORTVA WINAPIV
# define ZEXPORTVA(x) x WINAPIV
# else
# define ZEXPORTVA FAR _cdecl _export
# define ZEXPORTVA(x) x FAR _cdecl _export
# endif
# endif
# if defined (__BORLANDC__)
# if (__BORLANDC__ >= 0x0500) && defined (WIN32)
# include <windows.h>
# define ZEXPORT __declspec(dllexport) WINAPI
# define ZEXPORTRVA __declspec(dllexport) WINAPIV
# define ZEXPORT(x) x __declspec(dllexport) WINAPI
# define ZEXPORTRVA(x) x __declspec(dllexport) WINAPIV
# else
# if defined (_Windows) && defined (__DLL__)
# define ZEXPORT _export
# define ZEXPORTVA _export
# define ZEXPORT(x) x _export
# define ZEXPORTVA(x) x _export
# endif
# endif
# endif
@ -190,16 +193,16 @@
#ifndef ZEXPORT
# define ZEXPORT
# define ZEXPORT(x) static x
#endif
#ifndef ZEXPORTVA
# define ZEXPORTVA
# define ZEXPORTVA(x) static x
#endif
#ifndef ZEXTERN
# define ZEXTERN static
# define ZEXTERN(x) static x
#endif
#ifndef ZEXTERNDEF
# define ZEXTERNDEF static
# define ZEXTERNDEF(x) static x
#endif
#ifndef FAR

18
src/gzip/zlib.h
Unescape View File

@ -173,7 +173,7 @@ typedef z_stream FAR *z_streamp;
*/
/*
ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
ZEXTERN(int) deflateInit OF((z_streamp strm, int level));
Initializes the internal stream state for compression. The fields
zalloc, zfree and opaque must be initialized before by the caller.
@ -286,7 +286,7 @@ ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
/*
ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
ZEXTERN(int) inflateInit OF((z_streamp strm));
Initializes the internal stream state for decompression. The fields
next_in, avail_in, zalloc, zfree and opaque must be initialized before by
@ -306,7 +306,7 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
*/
ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
ZEXTERN(int) inflate OF((z_streamp strm, int flush));
/*
inflate decompresses as much data as possible, and stops when the input
buffer becomes empty or the output buffer becomes full. It may some
@ -375,7 +375,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
*/
ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
ZEXTERN(int) inflateEnd OF((z_streamp strm));
/*
All dynamically allocated data structures for this stream are freed.
This function discards any unprocessed input and does not flush any
@ -393,7 +393,7 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
*/
/*
ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
ZEXTERN(int) deflateInit2 OF((z_streamp strm,
int level,
int method,
int windowBits,
@ -514,7 +514,7 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
*/
/*
ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
ZEXTERN(int) inflateInit2 OF((z_streamp strm,
int windowBits));
This is another version of inflateInit with an extra parameter. The
@ -566,7 +566,7 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
until success or end of the input data.
*/
ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
ZEXTERN(int) inflateReset OF((z_streamp strm));
/*
This function is equivalent to inflateEnd followed by inflateInit,
but does not free and reallocate all the internal decompression state.
@ -772,7 +772,7 @@ ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
compression library.
*/
ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
ZEXTERN(uLong) adler32 OF((uLong adler, const Bytef *buf, uInt len));
/*
Update a running Adler-32 checksum with the bytes buf[0..len-1] and
@ -810,7 +810,7 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
/* deflateInit and inflateInit are macros to allow checking the zlib version
* and the compiler's view of z_stream:
*/
ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits,
ZEXTERN(int) inflateInit2_ OF((z_streamp strm, int windowBits,
const char *version, int stream_size));
#define deflateInit(strm, level) \
deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))

2
src/gzip/zutil.h
Unescape View File

@ -203,7 +203,7 @@ typedef unsigned long ulg;
#endif
typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
typedef uLong (*check_func) OF((uLong check, const Bytef *buf,
uInt len));
local voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
local void zcfree OF((voidpf opaque, voidpf ptr));

Write Preview
Loading…
Cancel
Save