diff options
author | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
---|---|---|
committer | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
commit | 1ebdb2e521ca0cbd7aeebd1c89b8a5cf6a4cc322 (patch) | |
tree | d6dde0ea7b6e6e15cc2c51a5f478fb85965b9720 /wsutil/file_util.h | |
parent | 0b8d70bfb715bc3d89b6dfae86fc79d7c4387f02 (diff) |
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
Diffstat (limited to 'wsutil/file_util.h')
-rw-r--r-- | wsutil/file_util.h | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/wsutil/file_util.h b/wsutil/file_util.h index a39e82461d..e07da108a6 100644 --- a/wsutil/file_util.h +++ b/wsutil/file_util.h @@ -67,23 +67,15 @@ extern "C" { #include <stdio.h> -WS_DLL_PUBLIC -extern int ws_stdio_open (const gchar *filename, int flags, int mode); -WS_DLL_PUBLIC -extern int ws_stdio_rename (const gchar *oldfilename, const gchar *newfilename); -WS_DLL_PUBLIC -extern int ws_stdio_mkdir (const gchar *filename, int mode); -WS_DLL_PUBLIC -extern int ws_stdio_stat64 (const gchar *filename, ws_statb64 *buf); -WS_DLL_PUBLIC -extern int ws_stdio_unlink (const gchar *filename); -WS_DLL_PUBLIC -extern int ws_stdio_remove (const gchar *filename); +WS_DLL_PUBLIC int ws_stdio_open (const gchar *filename, int flags, int mode); +WS_DLL_PUBLIC int ws_stdio_rename (const gchar *oldfilename, const gchar *newfilename); +WS_DLL_PUBLIC int ws_stdio_mkdir (const gchar *filename, int mode); +WS_DLL_PUBLIC int ws_stdio_stat64 (const gchar *filename, ws_statb64 *buf); +WS_DLL_PUBLIC int ws_stdio_unlink (const gchar *filename); +WS_DLL_PUBLIC int ws_stdio_remove (const gchar *filename); -WS_DLL_PUBLIC -extern FILE * ws_stdio_fopen (const gchar *filename, const gchar *mode); -WS_DLL_PUBLIC -extern FILE * ws_stdio_freopen (const gchar *filename, const gchar *mode, FILE *stream); +WS_DLL_PUBLIC FILE * ws_stdio_fopen (const gchar *filename, const gchar *mode); +WS_DLL_PUBLIC FILE * ws_stdio_freopen (const gchar *filename, const gchar *mode, FILE *stream); #define ws_open ws_stdio_open #define ws_rename ws_stdio_rename @@ -139,15 +131,13 @@ GModule *ws_module_open(gchar *module_name, GModuleFlags flags); /* * utf8 version of getenv, needed to get win32 filename paths */ -WS_DLL_PUBLIC -extern char *getenv_utf8(const char *varname); +WS_DLL_PUBLIC char *getenv_utf8(const char *varname); /** Create or open a "Wireshark is running" mutex. * Create or open a mutex which signals that Wireshark or its associated * executables is running. Used by the installer to test for a running application. */ -WS_DLL_PUBLIC -extern void create_app_running_mutex(); +WS_DLL_PUBLIC void create_app_running_mutex(); #else /* _WIN32 */ |