diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-03 01:43:39 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-03 01:43:39 +0000 |
| commit | 5d87a8c46171f572568db5a47c093423482e342f (patch) | |
| tree | 07a700792f034ede91c707b927cd94f4887d5394 /epan/follow.c | |
| parent | a3543e605022d4385d536cd4f916d9a29051e637 (diff) | |
WS_DLL_PUBLIC is now always WS_DLL_PUBLIC_NOEXTERN with "extern" added;
just define WS_DLL_PUBLIC_NOEXTERN inside the ifdefs, and define
WS_DLL_PUBLIC as WS_DLL_PUBLIC_NOEXTERN followed by "extern".
Then rename WS_DLL_PUBLIC_NOEXTERN to WS_DLL_PUBLIC_DEF, to clarify that
it's what should be used for definitions; at least on Windows, you
*have* to use it when declaring arrays without a size, and, whilst you
might be able to use WS_DLL_PUBLIC for definitions of functions and
perhaps data definitions other than no-size arrays, it might be clearer
to rename WS_DLL_PUBLIC to WS_DLL_PUBLIC_DECL and use it only for
declarations.
svn path=/trunk/; revision=50334
Diffstat (limited to 'epan/follow.c')
| -rw-r--r-- | epan/follow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/follow.c b/epan/follow.c index 0765201bb3..f4b156ce48 100644 --- a/epan/follow.c +++ b/epan/follow.c @@ -50,7 +50,7 @@ typedef struct _tcp_frag { struct _tcp_frag *next; } tcp_frag; -WS_DLL_PUBLIC_NOEXTERN +WS_DLL_PUBLIC_DEF FILE* data_out_file = NULL; gboolean empty_tcp_stream; |