diff options
| author | Ashok Narayanan <ashokn@cisco.com> | 2001-09-20 16:36:45 +0000 |
|---|---|---|
| committer | Ashok Narayanan <ashokn@cisco.com> | 2001-09-20 16:36:45 +0000 |
| commit | 29c8fa03b3a2d73b52f4731b06b801d9e28de9a2 (patch) | |
| tree | 3ce1bb901498f45652612641036a013d27a49e32 /wiretap/file_wrappers.h | |
| parent | d1ec951825b9cee63227ef9347d1d2b082966e4d (diff) | |
| download | wireshark-29c8fa03b3a2d73b52f4731b06b801d9e28de9a2.tar.gz wireshark-29c8fa03b3a2d73b52f4731b06b801d9e28de9a2.tar.bz2 wireshark-29c8fa03b3a2d73b52f4731b06b801d9e28de9a2.zip | |
Removed the dependency on gzgetc and gzgets by implementing internal
versions of these commands in file_wrappers.c. This allows us to
compile successfully even on platforms where X has an older zlib built
in.
Removed this restriction from acinclude.m4
svn path=/trunk/; revision=3948
Diffstat (limited to 'wiretap/file_wrappers.h')
| -rw-r--r-- | wiretap/file_wrappers.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h index 61c5376a90..7be3b0b8d5 100644 --- a/wiretap/file_wrappers.h +++ b/wiretap/file_wrappers.h @@ -1,6 +1,6 @@ /* file_wrappers.h * - * $Id: file_wrappers.h,v 1.4 2000/01/26 19:22:04 guy Exp $ + * $Id: file_wrappers.h,v 1.5 2001/09/20 16:36:45 ashokn Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org> @@ -32,8 +32,10 @@ extern long file_seek(void *stream, long offset, int whence); #define file_write(buf, bsize, count, file) gzwrite((file),(buf),((count)*(bsize))) #define file_close gzclose extern long file_tell(void *stream); -#define file_getc gzgetc -#define file_gets(buf, len, file) gzgets((file), (buf), (len)) +char * internal_gzgets(gzFile file, char *buf, int len); +int internal_gzgetc(gzFile file); +#define file_getc internal_gzgetc +#define file_gets(buf, len, file) internal_gzgets((file), (buf), (len)) extern int file_error(void *fh); #else /* No zLib */ |