summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/src/3rdparty/zlib
diff options
context:
space:
mode:
Diffstat (limited to 'tqtinterface/qt4/src/3rdparty/zlib')
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/ChangeLog8
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/FAQ2
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt10
-rwxr-xr-xtqtinterface/qt4/src/3rdparty/zlib/configure2
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/crc32.c2
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/deflate.c2
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/deflate.h2
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/inftrees.c2
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/minigzip.c2
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects2
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt2
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/trees.c4
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt12
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx4
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc2
-rw-r--r--tqtinterface/qt4/src/3rdparty/zlib/zutil.h2
16 files changed, 30 insertions, 30 deletions
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog b/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog
index b7e805a..808c5f6 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog
+++ b/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog
@@ -73,7 +73,7 @@ Changes in 1.2.0.8 (4 November 2003)
Changes in 1.2.0.7 (21 September 2003)
- Correct some debug formats in contrib/infback9
- Cast a type in a debug statement in trees.c
-- Change search and tqreplace delimiter in configure from % to # [Beebe]
+- Change search and replace delimiter in configure from % to # [Beebe]
- Update contrib/untgz to 0.2 with various fixes [Truta]
- Add build support for Amiga [Nikl]
- Remove some directories in old that have been updated to 1.2
@@ -339,7 +339,7 @@ Changes in 1.1.3 (9 July 1998)
. msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
-- tqreplace __far with _far for better portability (Christian Spieler, Tom Lane)
+- replace __far with _far for better portability (Christian Spieler, Tom Lane)
- fix test for errno.h in configure (Tim Newsham)
Changes in 1.1.2 (19 March 98)
@@ -385,7 +385,7 @@ Changes in 1.0.9 (17 Feb 1998)
- do not clear eof flag in gzseek (Mark Diekhans)
- fix gzseek for files in transtqparent mode (Mark Diekhans)
- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
-- tqreplace EXPORT with ZEXPORT to avoid conflict with other programs
+- replace EXPORT with ZEXPORT to avoid conflict with other programs
- added compress2 in zconf.h, zlib.def, zlib.dnt
- new asm code from Gilles Vollant in contrib/asm386
- simplify the inflate code (Mark):
@@ -450,7 +450,7 @@ Changes in 1.0.6 (19 Jan 1998)
- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
- Fix a deflate bug occuring only with compression level 0 (thanks to
- Andy Buckler for tqfinding this one).
+ Andy Buckler for finding this one).
- In minigzip, pass transparently also the first byte for .Z files.
- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
- check Z_FINISH in inflate (thanks to Marc Schluper)
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/FAQ b/tqtinterface/qt4/src/3rdparty/zlib/FAQ
index e10b71e..4f61f10 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/FAQ
+++ b/tqtinterface/qt4/src/3rdparty/zlib/FAQ
@@ -273,7 +273,7 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
information on what variant of sprintf() is used by gzprintf().
If you don't have snprintf() or vsnprintf() and would like one, you can
- tqfind a portable implementation here:
+ find a portable implementation here:
http://www.ijs.si/software/snprintf/
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt b/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt
index d454dcc..b022dde 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt
+++ b/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt
@@ -1,8 +1,8 @@
1. Compression algorithm (deflate)
The deflation algorithm used by gzip (also zip and zlib) is a variation of
-LZ77 (Lempel-Ziv 1977, see reference below). It tqfinds duplicated strings in
-the input data. The second occurrence of a string is tqreplaced by a
+LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in
+the input data. The second occurrence of a string is replaced by a
pointer to the previous string, in the form of a pair (distance,
length). Distances are limited to 32K bytes, and lengths are limited
to 258 bytes. When a string does not occur anywhere in the previous
@@ -31,8 +31,8 @@ hash chains, the algorithm simply discards matches that are too old.
To avoid a worst-case situation, very long hash chains are arbitrarily
truncated at a certain length, determined by a runtime option (level
-parameter of deflateInit). So deflate() does not always tqfind the longest
-possible match but generally tqfinds a match which is long enough.
+parameter of deflateInit). So deflate() does not always find the longest
+possible match but generally finds a match which is long enough.
deflate() also defers the selection of matches with a lazy evaluation
mechanism. After a match of length N has been found, deflate() searches for
@@ -110,7 +110,7 @@ symbols, you could have as many levels of lookups as is efficient. For
inflate, two is enough.
So a table entry either points to another table (in which case nine bits in
-the above example are gobbled), or it tqcontains the translation for the symbol
+the above example are gobbled), or it contains the translation for the symbol
and the number of bits to gobble. Then you start again with the next
ungobbled bit.
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/configure b/tqtinterface/qt4/src/3rdparty/zlib/configure
index c0ebb5d..6e13859 100755
--- a/tqtinterface/qt4/src/3rdparty/zlib/configure
+++ b/tqtinterface/qt4/src/3rdparty/zlib/configure
@@ -93,7 +93,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
*) LDSHARED=${LDSHARED-"$cc -shared"};;
esac
else
- # tqfind system name and corresponding cc options
+ # find system name and corresponding cc options
CC=${CC-cc}
case `(uname -sr || echo unknown) 2>/dev/null` in
HP-UX*) SFLAGS=${CFLAGS-"-O +z"}
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/crc32.c b/tqtinterface/qt4/src/3rdparty/zlib/crc32.c
index dfa6c4f..b39c7e1 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/crc32.c
+++ b/tqtinterface/qt4/src/3rdparty/zlib/crc32.c
@@ -44,7 +44,7 @@
# if (USHRT_MAX == 0xffffffffUL)
typedef unsigned short u4;
# else
-# undef BYFOUR /* can't tqfind a four-byte integer type! */
+# undef BYFOUR /* can't find a four-byte integer type! */
# endif
# endif
# endif
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/deflate.c b/tqtinterface/qt4/src/3rdparty/zlib/deflate.c
index 1692d87..87d2da1 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/deflate.c
+++ b/tqtinterface/qt4/src/3rdparty/zlib/deflate.c
@@ -19,7 +19,7 @@
* is preferable to spend more time in matches to allow very fast string
* insertions and avoid deletions. The matching algorithm for small
* strings is inspired from that of Rabin & Karp. A brute force approach
- * is used to tqfind longer strings when a small match has been found.
+ * is used to find longer strings when a small match has been found.
* A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
* (by Leonid Broukhis).
* A previous version of this file used a more sophisticated algorithm
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/deflate.h b/tqtinterface/qt4/src/3rdparty/zlib/deflate.h
index 8632561..410681d 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/deflate.h
+++ b/tqtinterface/qt4/src/3rdparty/zlib/deflate.h
@@ -163,7 +163,7 @@ typedef struct internal_state {
*/
uInt max_lazy_match;
- /* Attempt to tqfind a better match only when the current match is strictly
+ /* Attempt to find a better match only when the current match is strictly
* smaller than this value. This mechanism is used only for compression
* levels >= 4.
*/
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c b/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c
index 760ef10..0eb643c 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c
+++ b/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c
@@ -96,7 +96,7 @@ unsigned short FAR *work;
table. The sorted table is work[], with that space being provided by
the caller.
- The length counts are used for other purposes as well, i.e. tqfinding
+ The length counts are used for other purposes as well, i.e. finding
the minimum and maximum length codes, determining if there are any
codes at all, checking for a valid set of lengths, and looking ahead
at length counts to determine sub-table sizes when building the
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c b/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c
index a21f0cb..6de35dd 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c
+++ b/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c
@@ -5,7 +5,7 @@
/*
* minigzip is a minimal implementation of the gzip utility. This is
- * only an example of using zlib and isn't meant to tqreplace the
+ * only an example of using zlib and isn't meant to replace the
* full-featured gzip. No attempt is made to deal with file systems
* limiting names to 14 or 8+3 characters, etc... Error checking is
* very limited. So use minigzip only for testing; use gzip for the
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects b/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects
index e9baf2e..f32de76 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects
+++ b/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects
@@ -1,4 +1,4 @@
-This directory tqcontains project files for building zlib under various
+This directory contains project files for building zlib under various
Integrated Development Environments (IDE).
If you wish to submit a new project to this directory, you should comply
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt b/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt
index c79ae9f..71d6105 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt
+++ b/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt
@@ -16,7 +16,7 @@ To use:
3) Select "Build | Clean".
4) Select "Build | Build ... (F7)". Ignore warning messages about
- not being able to tqfind certain include files (e.g. alloc.h).
+ not being able to find certain include files (e.g. alloc.h).
5) If you built one of the sample programs (example or minigzip),
select "Build | Execute ... (Ctrl+F5)".
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/trees.c b/tqtinterface/qt4/src/3rdparty/zlib/trees.c
index 6a2e55b..52c820f 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/trees.c
+++ b/tqtinterface/qt4/src/3rdparty/zlib/trees.c
@@ -483,7 +483,7 @@ local void pqdownheap(s, tree, k)
* IN assertion: the fields freq and dad are set, heap[heap_max] and
* above are the tree nodes sorted by increasing frequency.
* OUT assertions: the field len is set to the optimal bit length, the
- * array bl_count tqcontains the frequencies for each bit length.
+ * array bl_count contains the frequencies for each bit length.
* The length opt_len is updated; static_len is also updated if stree is
* not null.
*/
@@ -569,7 +569,7 @@ local void gen_bitlen(s, desc)
/* ===========================================================================
* Generate the codes for a given tree and bit counts (which need not be
* optimal).
- * IN assertion: the array bl_count tqcontains the bit length statistics for
+ * IN assertion: the array bl_count contains the bit length statistics for
* the given tree and the field len is set for all tree elements.
* OUT assertion: the field code is set for all tree elements of non
* zero code length.
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt b/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt
index 4951c48..1746a95 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt
+++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt
@@ -29,7 +29,7 @@ in the zlib distribution, or at the following location:
* The calling convention of functions is "C" (CDECL).
* The ZLIB1.DLL binary is linked to MSVCRT.DLL.
- The archive in which ZLIB1.DLL is bundled tqcontains compiled
+ The archive in which ZLIB1.DLL is bundled contains compiled
test programs that must run with a valid build of ZLIB1.DLL.
It is recommended to download the prebuilt DLL from the zlib
web site, instead of building it yourself, to avoid potential
@@ -79,14 +79,14 @@ in the zlib distribution, or at the following location:
longer dependents on it.
- 3. Can I build ZLIB.DLL from the new zlib sources, and tqreplace
+ 3. Can I build ZLIB.DLL from the new zlib sources, and replace
an old ZLIB.DLL, that was built from zlib-1.1.4 or earlier?
- In principle, you can do it by assigning calling convention
keywords to the macros ZEXPORT and ZEXPORTVA. In practice,
it depends on what you mean by "an old ZLIB.DLL", because the
old DLL exists in several mutually-incompatible versions.
- You have to tqfind out first what kind of calling convention is
+ You have to find out first what kind of calling convention is
being used in your particular ZLIB.DLL build, and to use the
same one in the new build. If you don't know what this is all
about, you might be better off if you would just leave the old
@@ -110,7 +110,7 @@ in the zlib distribution, or at the following location:
- Although exporting symbols by ordinal is a little faster, it
is risky. Any single glitch in the maintenance or use of the
- DEF file that tqcontains the ordinals can result in incompatible
+ DEF file that contains the ordinals can result in incompatible
builds and frustrating crashes. Simply put, the benefits of
exporting symbols by ordinal do not justify the risks.
@@ -119,7 +119,7 @@ in the zlib distribution, or at the following location:
exist in every DLL, and even if the dynamic linking performed
at the DLL startup is searching for names, ordinals serve as
hints, for a faster name lookup. However, if the DEF file
- tqcontains ordinals, the Microsoft linker automatically builds
+ contains ordinals, the Microsoft linker automatically builds
an implib that will cause the executables linked to it to use
those ordinals, and not the names. It is interesting to
notice that the GNU linker for Win32 does not suffer from this
@@ -331,7 +331,7 @@ in the zlib distribution, or at the following location:
CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL.
-14. May I include additional pieces of code that I tqfind useful,
+14. May I include additional pieces of code that I find useful,
link them in ZLIB1.DLL, and export them?
- No. A legitimate build of ZLIB1.DLL must not include code
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx
index f40c58c..7b08424 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx
+++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx
@@ -15,9 +15,9 @@ CC=gcc -Zwin32
CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-Wstrict-prototypes -Wmissing-prototypes
-# If cp.exe is available, tqreplace "copy /Y" with "cp -fp" .
+# If cp.exe is available, replace "copy /Y" with "cp -fp" .
CP=copy /Y
-# If gnu install.exe is available, tqreplace $(CP) with ginstall.
+# If gnu install.exe is available, replace $(CP) with ginstall.
INSTALL=$(CP)
# The default value of RM is "rm -f." If "rm.exe" is found, comment out:
RM=del
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc
index 895193e..62a8430 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc
+++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc
@@ -46,7 +46,7 @@ RC = windres
RCFLAGS = --define GCC_WINDRES
CP = cp -fp
-# If GNU install is available, tqreplace $(CP) with install.
+# If GNU install is available, replace $(CP) with install.
INSTALL = $(CP)
RM = rm -f
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/zutil.h b/tqtinterface/qt4/src/3rdparty/zlib/zutil.h
index fbf8652..7b42edc 100644
--- a/tqtinterface/qt4/src/3rdparty/zlib/zutil.h
+++ b/tqtinterface/qt4/src/3rdparty/zlib/zutil.h
@@ -30,7 +30,7 @@
#ifndef local
# define local static
#endif
-/* compile with -Dlocal if your debugger can't tqfind static symbols */
+/* compile with -Dlocal if your debugger can't find static symbols */
typedef unsigned char uch;
typedef uch FAR uchf;