diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-11-05 22:46:44 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-11-05 22:46:44 +0000 |
| commit | d494883dde3d40cce3f04e8dd1f0d73037e63378 (patch) | |
| tree | a4abb83c0c20eafb12ab250bcf7f32f74f281b44 /wiretap/file_wrappers.h | |
| parent | 3928e1990145cf1cc0eb0de01d1196f422d78a4c (diff) | |
change all file offsets from long to gint64 so we can - theoretically - handle files > 2GB correct.
Please distclean Win32 builds!
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19814 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap/file_wrappers.h')
| -rw-r--r-- | wiretap/file_wrappers.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h index c5ace29953..9dcf643ff6 100644 --- a/wiretap/file_wrappers.h +++ b/wiretap/file_wrappers.h @@ -24,29 +24,28 @@ #ifndef __FILE_H__ #define __FILE_H__ +extern gint64 file_seek(void *stream, gint64 offset, int whence, int *err); +extern gint64 file_tell(void *stream); +extern int file_error(void *fh); + #ifdef HAVE_LIBZ extern FILE_T file_open(const char *path, const char *mode); #define filed_open gzdopen -extern long file_seek(void *stream, long offset, int whence, int *err); #define file_read(buf, bsize, count, file) gzread((file),(buf),((count)*(bsize))) #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)) -extern int file_error(void *fh); #define file_eof gzeof #else /* No zLib */ +/* XXX - mixing eth_xxx and fxxx calls might not be a good idea with MSVC 2005! */ #define file_open(path, mode) eth_fopen(path, mode) #define filed_open fdopen -extern long file_seek(void *stream, long offset, int whence, int *err); #define file_read fread #define file_write fwrite #define file_close fclose -extern int file_error(FILE *fh); -#define file_tell ftell #define file_getc fgetc #define file_gets fgets #define file_eof feof |