summaryrefslogtreecommitdiff
path: root/xc/lib/zlib
diff options
context:
space:
mode:
Diffstat (limited to 'xc/lib/zlib')
-rw-r--r--xc/lib/zlib/Imakefile4
-rw-r--r--xc/lib/zlib/README2
-rw-r--r--xc/lib/zlib/adler32.c2
-rw-r--r--xc/lib/zlib/compress.c2
-rw-r--r--xc/lib/zlib/crc32.c2
-rw-r--r--xc/lib/zlib/deflate.c2
-rw-r--r--xc/lib/zlib/deflate.h2
-rw-r--r--xc/lib/zlib/gzio.c2
-rw-r--r--xc/lib/zlib/infblock.c2
-rw-r--r--xc/lib/zlib/infblock.h2
-rw-r--r--xc/lib/zlib/infcodes.c2
-rw-r--r--xc/lib/zlib/infcodes.h2
-rw-r--r--xc/lib/zlib/inffast.c2
-rw-r--r--xc/lib/zlib/inffast.h2
-rw-r--r--xc/lib/zlib/inflate.c2
-rw-r--r--xc/lib/zlib/inftrees.c2
-rw-r--r--xc/lib/zlib/inftrees.h2
-rw-r--r--xc/lib/zlib/infutil.c2
-rw-r--r--xc/lib/zlib/infutil.h2
-rw-r--r--xc/lib/zlib/trees.c2
-rw-r--r--xc/lib/zlib/trees.h2
-rw-r--r--xc/lib/zlib/uncompr.c2
-rw-r--r--xc/lib/zlib/zconf.h4
-rw-r--r--xc/lib/zlib/zlib.h2
-rw-r--r--xc/lib/zlib/zutil.c2
-rw-r--r--xc/lib/zlib/zutil.h14
26 files changed, 34 insertions, 34 deletions
diff --git a/xc/lib/zlib/Imakefile b/xc/lib/zlib/Imakefile
index a710cbcbf..4e0ece373 100644
--- a/xc/lib/zlib/Imakefile
+++ b/xc/lib/zlib/Imakefile
@@ -1,10 +1,10 @@
-XCOMM $TOG: Imakefile /main/4 1998/02/04 14:32:56 kaleb $
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:46 cpqbld Exp $
-XCOMM $XFree86: xc/lib/zlib/Imakefile,v 1.7 2000/08/09 23:40:16 dawes Exp $
+XCOMM $XFree86: xc/lib/zlib/Imakefile,v 1.8 2001/01/17 19:43:50 dawes Exp $
#ifndef cygwinArchitecture
#define DoNormalLib YES
diff --git a/xc/lib/zlib/README b/xc/lib/zlib/README
index 40de93d4e..94481b59f 100644
--- a/xc/lib/zlib/README
+++ b/xc/lib/zlib/README
@@ -1,4 +1,4 @@
-/* $TOG: README /main/4 1998/02/04 14:33:02 kaleb $ */
+/* $Xorg: README,v 1.3 2000/08/17 19:46:46 cpqbld Exp $ */
zlib 1.0.8 is a general purpose data compression library. All the code
is thread safe. The data format used by the zlib library
diff --git a/xc/lib/zlib/adler32.c b/xc/lib/zlib/adler32.c
index d64336b44..df1958429 100644
--- a/xc/lib/zlib/adler32.c
+++ b/xc/lib/zlib/adler32.c
@@ -1,4 +1,4 @@
-/* $TOG: adler32.c /main/4 1998/02/04 14:33:06 kaleb $ */
+/* $Xorg: adler32.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* adler32.c -- compute the Adler-32 checksum of a data stream
* Copyright (C) 1995-1996 Mark Adler
diff --git a/xc/lib/zlib/compress.c b/xc/lib/zlib/compress.c
index 3ac5e71f2..99e22cd26 100644
--- a/xc/lib/zlib/compress.c
+++ b/xc/lib/zlib/compress.c
@@ -1,4 +1,4 @@
-/* $TOG: compress.c /main/1 1998/02/04 14:33:10 kaleb $ */
+/* $Xorg: compress.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* compress.c -- compress a memory buffer
* Copyright (C) 1995-1998 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
diff --git a/xc/lib/zlib/crc32.c b/xc/lib/zlib/crc32.c
index c6355439a..4eba3e120 100644
--- a/xc/lib/zlib/crc32.c
+++ b/xc/lib/zlib/crc32.c
@@ -1,4 +1,4 @@
-/* $TOG: crc32.c /main/3 1998/02/04 14:33:14 kaleb $ */
+/* $Xorg: crc32.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* crc32.c -- compute the CRC-32 of a data stream
* Copyright (C) 1995-1996 Mark Adler
diff --git a/xc/lib/zlib/deflate.c b/xc/lib/zlib/deflate.c
index 19ce033a0..9c4763ba5 100644
--- a/xc/lib/zlib/deflate.c
+++ b/xc/lib/zlib/deflate.c
@@ -1,4 +1,4 @@
-/* $TOG: deflate.c /main/4 1998/02/04 14:33:18 kaleb $ */
+/* $Xorg: deflate.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* deflate.c -- compress data using the deflation algorithm
* Copyright (C) 1995-1998 Jean-loup Gailly.
diff --git a/xc/lib/zlib/deflate.h b/xc/lib/zlib/deflate.h
index 57d4f5890..4ee3bddab 100644
--- a/xc/lib/zlib/deflate.h
+++ b/xc/lib/zlib/deflate.h
@@ -1,4 +1,4 @@
-/* $TOG: deflate.h /main/4 1998/02/04 14:33:24 kaleb $ */
+/* $Xorg: deflate.h,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* deflate.h -- internal compression state
* Copyright (C) 1995-1998 Jean-loup Gailly
diff --git a/xc/lib/zlib/gzio.c b/xc/lib/zlib/gzio.c
index 7936ad796..bbbf40615 100644
--- a/xc/lib/zlib/gzio.c
+++ b/xc/lib/zlib/gzio.c
@@ -1,4 +1,4 @@
-/* $TOG: gzio.c /main/1 1998/02/04 14:33:29 kaleb $ */
+/* $Xorg: gzio.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* gzio.c -- IO on .gz files
* Copyright (C) 1995-1998 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
diff --git a/xc/lib/zlib/infblock.c b/xc/lib/zlib/infblock.c
index 9020cc655..86784ff05 100644
--- a/xc/lib/zlib/infblock.c
+++ b/xc/lib/zlib/infblock.c
@@ -1,4 +1,4 @@
-/* $TOG: infblock.c /main/4 1998/02/04 14:33:33 kaleb $ */
+/* $Xorg: infblock.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* infblock.c -- interpret and process block types to last block
* Copyright (C) 1995-1998 Mark Adler
diff --git a/xc/lib/zlib/infblock.h b/xc/lib/zlib/infblock.h
index 91a0df499..5668bab15 100644
--- a/xc/lib/zlib/infblock.h
+++ b/xc/lib/zlib/infblock.h
@@ -1,4 +1,4 @@
-/* $TOG: infblock.h /main/4 1998/02/04 14:33:37 kaleb $ */
+/* $Xorg: infblock.h,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* infblock.h -- header to use infblock.c
* Copyright (C) 1995-1998 Mark Adler
diff --git a/xc/lib/zlib/infcodes.c b/xc/lib/zlib/infcodes.c
index 1ecdf272c..d533ba880 100644
--- a/xc/lib/zlib/infcodes.c
+++ b/xc/lib/zlib/infcodes.c
@@ -1,4 +1,4 @@
-/* $TOG: infcodes.c /main/4 1998/02/04 14:33:41 kaleb $ */
+/* $Xorg: infcodes.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* infcodes.c -- process literals and length/distance pairs
* Copyright (C) 1995-1998 Mark Adler
diff --git a/xc/lib/zlib/infcodes.h b/xc/lib/zlib/infcodes.h
index e2e874a46..ca1461734 100644
--- a/xc/lib/zlib/infcodes.h
+++ b/xc/lib/zlib/infcodes.h
@@ -1,4 +1,4 @@
-/* $TOG: infcodes.h /main/4 1998/02/04 14:33:46 kaleb $ */
+/* $Xorg: infcodes.h,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* infcodes.h -- header to use infcodes.c
* Copyright (C) 1995-1998 Mark Adler
diff --git a/xc/lib/zlib/inffast.c b/xc/lib/zlib/inffast.c
index 85826f38b..45eda1b0e 100644
--- a/xc/lib/zlib/inffast.c
+++ b/xc/lib/zlib/inffast.c
@@ -1,4 +1,4 @@
-/* $TOG: inffast.c /main/4 1998/02/04 14:33:49 kaleb $ */
+/* $Xorg: inffast.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* inffast.c -- process literals and length/distance pairs fast
* Copyright (C) 1995-1998 Mark Adler
diff --git a/xc/lib/zlib/inffast.h b/xc/lib/zlib/inffast.h
index 5f5c32cfa..a4cc75ae6 100644
--- a/xc/lib/zlib/inffast.h
+++ b/xc/lib/zlib/inffast.h
@@ -1,4 +1,4 @@
-/* $TOG: inffast.h /main/4 1998/02/04 14:33:53 kaleb $ */
+/* $Xorg: inffast.h,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* inffast.h -- header to use inffast.c
* Copyright (C) 1995-1998 Mark Adler
diff --git a/xc/lib/zlib/inflate.c b/xc/lib/zlib/inflate.c
index faa43190f..aadb41b0e 100644
--- a/xc/lib/zlib/inflate.c
+++ b/xc/lib/zlib/inflate.c
@@ -1,4 +1,4 @@
-/* $TOG: inflate.c /main/4 1998/02/04 14:33:57 kaleb $ */
+/* $Xorg: inflate.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* inflate.c -- zlib interface to inflate modules
* Copyright (C) 1995-1998 Mark Adler
diff --git a/xc/lib/zlib/inftrees.c b/xc/lib/zlib/inftrees.c
index bf3d5d227..64006a139 100644
--- a/xc/lib/zlib/inftrees.c
+++ b/xc/lib/zlib/inftrees.c
@@ -1,4 +1,4 @@
-/* $TOG: inftrees.c /main/4 1998/02/04 14:34:01 kaleb $ */
+/* $Xorg: inftrees.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* inftrees.c -- generate Huffman trees for efficient decoding
* Copyright (C) 1995-1998 Mark Adler
diff --git a/xc/lib/zlib/inftrees.h b/xc/lib/zlib/inftrees.h
index efd5a20b6..bbde2fc24 100644
--- a/xc/lib/zlib/inftrees.h
+++ b/xc/lib/zlib/inftrees.h
@@ -1,4 +1,4 @@
-/* $TOG: inftrees.h /main/5 1998/02/04 14:34:06 kaleb $ */
+/* $Xorg: inftrees.h,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* inftrees.h -- header to use inftrees.c
* Copyright (C) 1995-1998 Mark Adler
diff --git a/xc/lib/zlib/infutil.c b/xc/lib/zlib/infutil.c
index 4666f48de..a45dbaa82 100644
--- a/xc/lib/zlib/infutil.c
+++ b/xc/lib/zlib/infutil.c
@@ -1,4 +1,4 @@
-/* $TOG: infutil.c /main/4 1998/02/04 14:34:09 kaleb $ */
+/* $Xorg: infutil.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* inflate_util.c -- data and routines common to blocks and codes
* Copyright (C) 1995-1998 Mark Adler
diff --git a/xc/lib/zlib/infutil.h b/xc/lib/zlib/infutil.h
index 9a8f94e45..cf189fa25 100644
--- a/xc/lib/zlib/infutil.h
+++ b/xc/lib/zlib/infutil.h
@@ -1,4 +1,4 @@
-/* $TOG: infutil.h /main/4 1998/02/04 14:34:13 kaleb $ */
+/* $Xorg: infutil.h,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* infutil.h -- types and macros common to blocks and codes
* Copyright (C) 1995-1998 Mark Adler
diff --git a/xc/lib/zlib/trees.c b/xc/lib/zlib/trees.c
index 8ffaefd4b..3df647ea0 100644
--- a/xc/lib/zlib/trees.c
+++ b/xc/lib/zlib/trees.c
@@ -1,4 +1,4 @@
-/* $TOG: trees.c /main/4 1998/02/04 14:34:17 kaleb $ */
+/* $Xorg: trees.c,v 1.3 2000/08/17 19:46:47 cpqbld Exp $ */
/* trees.c -- output deflated data using Huffman coding
* Copyright (C) 1995-1998 Jean-loup Gailly
diff --git a/xc/lib/zlib/trees.h b/xc/lib/zlib/trees.h
index 5dbf3d402..7c9c8577f 100644
--- a/xc/lib/zlib/trees.h
+++ b/xc/lib/zlib/trees.h
@@ -1,4 +1,4 @@
-/* $TOG: trees.h /main/1 1998/02/04 14:34:22 kaleb $ */
+/* $Xorg: trees.h,v 1.3 2000/08/17 19:46:48 cpqbld Exp $ */
/* header created automatically with -DGEN_TREES_H */
local const ct_data static_ltree[L_CODES+2] = {
diff --git a/xc/lib/zlib/uncompr.c b/xc/lib/zlib/uncompr.c
index 9f68ad13b..958f23120 100644
--- a/xc/lib/zlib/uncompr.c
+++ b/xc/lib/zlib/uncompr.c
@@ -1,4 +1,4 @@
-/* $TOG: uncompr.c /main/1 1998/02/04 14:34:26 kaleb $ */
+/* $Xorg: uncompr.c,v 1.3 2000/08/17 19:46:48 cpqbld Exp $ */
/* uncompr.c -- decompress a memory buffer
* Copyright (C) 1995-1998 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
diff --git a/xc/lib/zlib/zconf.h b/xc/lib/zlib/zconf.h
index 1b2a54fc3..e33714686 100644
--- a/xc/lib/zlib/zconf.h
+++ b/xc/lib/zlib/zconf.h
@@ -1,11 +1,11 @@
-/* $TOG: zconf.h /main/5 1998/02/04 14:51:21 kaleb $ */
+/* $Xorg: zconf.h,v 1.3 2000/08/17 19:46:48 cpqbld Exp $ */
/* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-1996 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-/* $XFree86: xc/lib/zlib/zconf.h,v 1.6 2000/08/09 23:40:16 dawes Exp $ */
+/* $XFree86: xc/lib/zlib/zconf.h,v 1.7 2001/01/17 19:43:55 dawes Exp $ */
#ifndef _ZCONF_H
#define _ZCONF_H
diff --git a/xc/lib/zlib/zlib.h b/xc/lib/zlib/zlib.h
index 7d5497cb2..78114028a 100644
--- a/xc/lib/zlib/zlib.h
+++ b/xc/lib/zlib/zlib.h
@@ -1,4 +1,4 @@
-/* $TOG: zlib.h /main/4 1998/02/04 14:34:35 kaleb $ */
+/* $Xorg: zlib.h,v 1.3 2000/08/17 19:46:48 cpqbld Exp $ */
/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.0.8, Jan 27th, 1998
diff --git a/xc/lib/zlib/zutil.c b/xc/lib/zlib/zutil.c
index cecf6b864..c2bd02bda 100644
--- a/xc/lib/zlib/zutil.c
+++ b/xc/lib/zlib/zutil.c
@@ -1,4 +1,4 @@
-/* $TOG: zutil.c /main/4 1998/02/04 14:34:40 kaleb $ */
+/* $Xorg: zutil.c,v 1.3 2000/08/17 19:46:48 cpqbld Exp $ */
/* zutil.c -- target dependent utility functions for the compression library
* Copyright (C) 1995-1998 Jean-loup Gailly.
diff --git a/xc/lib/zlib/zutil.h b/xc/lib/zlib/zutil.h
index 070b39605..eeab64a0f 100644
--- a/xc/lib/zlib/zutil.h
+++ b/xc/lib/zlib/zutil.h
@@ -1,4 +1,4 @@
-/* $TOG: zutil.h /main/4 1998/02/04 14:34:44 kaleb $ */
+/* $Xorg: zutil.h,v 1.4 2000/08/17 19:46:48 cpqbld Exp $ */
/* zutil.h -- internal interface and configuration of the compression library
* Copyright (C) 1995-1998 Jean-loup Gailly.
@@ -15,16 +15,16 @@
#include "zlib.h"
+#if defined(MSDOS)||defined(VMS)||defined(CRAY)||defined(WIN32)||defined(RISCOS)||defined(__EMX__)||defined(STDC)
+# include <stddef.h>
+# include <errno.h>
+#else
+ extern int errno;
+#endif
#ifdef STDC
-# include <stddef.h>
# include <string.h>
# include <stdlib.h>
#endif
-#ifdef NO_ERRNO_H
- extern int errno;
-#else
-# include <errno.h>
-#endif
#ifndef local
# define local static