From 1ebdb2e521ca0cbd7aeebd1c89b8a5cf6a4cc322 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Fri, 1 Mar 2013 23:53:11 +0000 Subject: Export libwireshark symbols using WS_DLL_PUBLIC define Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992 --- wiretap/file_wrappers.h | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) (limited to 'wiretap/file_wrappers.h') diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h index ca02fbbab5..3de26aaefa 100644 --- a/wiretap/file_wrappers.h +++ b/wiretap/file_wrappers.h @@ -28,57 +28,33 @@ #include #include "ws_symbol_export.h" -WS_DLL_LOCAL extern FILE_T file_open(const char *path); -WS_DLL_LOCAL extern FILE_T file_fdopen(int fildes); -WS_DLL_LOCAL extern void file_set_random_access(FILE_T stream, gboolean random_flag, GPtrArray *seek); -WS_DLL_PUBLIC -extern gint64 file_seek(FILE_T stream, gint64 offset, int whence, int *err); -WS_DLL_LOCAL +WS_DLL_PUBLIC gint64 file_seek(FILE_T stream, gint64 offset, int whence, int *err); extern gint64 file_skip(FILE_T file, gint64 delta, int *err); -WS_DLL_PUBLIC -extern gint64 file_tell(FILE_T stream); -WS_DLL_LOCAL +WS_DLL_PUBLIC gint64 file_tell(FILE_T stream); extern gint64 file_tell_raw(FILE_T stream); -WS_DLL_LOCAL extern int file_fstat(FILE_T stream, ws_statb64 *statb, int *err); -WS_DLL_LOCAL extern gboolean file_iscompressed(FILE_T stream); -WS_DLL_PUBLIC -extern int file_read(void *buf, unsigned int count, FILE_T file); -WS_DLL_PUBLIC -extern int file_getc(FILE_T stream); -WS_DLL_PUBLIC -extern char *file_gets(char *buf, int len, FILE_T stream); -WS_DLL_PUBLIC -extern int file_eof(FILE_T stream); -WS_DLL_PUBLIC -extern int file_error(FILE_T fh, gchar **err_info); -WS_DLL_LOCAL +WS_DLL_PUBLIC int file_read(void *buf, unsigned int count, FILE_T file); +WS_DLL_PUBLIC int file_getc(FILE_T stream); +WS_DLL_PUBLIC char *file_gets(char *buf, int len, FILE_T stream); +WS_DLL_PUBLIC int file_eof(FILE_T stream); +WS_DLL_PUBLIC int file_error(FILE_T fh, gchar **err_info); extern void file_clearerr(FILE_T stream); -WS_DLL_LOCAL extern void file_fdclose(FILE_T file); -WS_DLL_LOCAL extern int file_fdreopen(FILE_T file, const char *path); -WS_DLL_LOCAL extern void file_close(FILE_T file); #ifdef HAVE_LIBZ typedef struct wtap_writer *GZWFILE_T; -WS_DLL_LOCAL extern GZWFILE_T gzwfile_open(const char *path); -WS_DLL_LOCAL extern GZWFILE_T gzwfile_fdopen(int fd); -WS_DLL_LOCAL extern guint gzwfile_write(GZWFILE_T state, const void *buf, guint len); -WS_DLL_LOCAL extern int gzwfile_flush(GZWFILE_T state); -WS_DLL_LOCAL extern int gzwfile_close(GZWFILE_T state); -WS_DLL_LOCAL extern int gzwfile_geterr(GZWFILE_T state); #endif /* HAVE_LIBZ */ -- cgit v1.2.1