diff options
| author | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
| commit | ec17f7788515f838ae8c595748fbd664f1e2f1f1 (patch) | |
| tree | 297104a1ee790469dfe9ff88a857a9836926bccc /lib/libz/example.c | |
| parent | 6d9b0264a175d883795d7a2549ca6f2d9c2a15b7 (diff) | |
| download | FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.zip FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'lib/libz/example.c')
| -rw-r--r-- | lib/libz/example.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libz/example.c b/lib/libz/example.c index c2361f9..6c8a0ee 100644 --- a/lib/libz/example.c +++ b/lib/libz/example.c @@ -1,5 +1,5 @@ /* example.c -- usage example of the zlib compression library - * Copyright (C) 1995-2003 Jean-loup Gailly. + * Copyright (C) 1995-2004 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -11,8 +11,6 @@ #ifdef STDC # include <string.h> # include <stdlib.h> -#else - extern void exit OF((int)); #endif #if defined(VMS) || defined(RISCOS) |
