diff options
| author | Evan Huus <eapache@gmail.com> | 2013-10-19 19:40:02 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-10-19 19:40:02 +0000 |
| commit | 1f3549168d7b750ad66307b6b9fb47091de16758 (patch) | |
| tree | 1698a85658a8ea037860df1de00a56d4dced1bb9 /epan/wmem | |
| parent | 3635bea0a4bccd33956cc10a9750f248cfcb4efc (diff) | |
Don't link explicitly with libwmem, it's already in libwireshark and the symbol
doubling leads to all sorts of very subtle badness (including test failures due
to funny internal assertions because the two wmems have mismatching state).
Make wmem_init and wmem_cleanup PUBLIC instead of LOCAL so that they don't get
stripped and don't cause a link failure when trying to build oids_test (now that
it's not linking with libwmem explicitly). There is possibly a better way to fix
this, but I'm not sure what it is.
svn path=/trunk/; revision=52694
Diffstat (limited to 'epan/wmem')
| -rw-r--r-- | epan/wmem/wmem_core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/wmem/wmem_core.h b/epan/wmem/wmem_core.h index 9a3f00e8da..08782ab8de 100644 --- a/epan/wmem/wmem_core.h +++ b/epan/wmem/wmem_core.h @@ -199,7 +199,7 @@ wmem_allocator_new(const wmem_allocator_type_t type); /** Initialize the wmem subsystem. This must be called before any other wmem * function, usually at the very beginning of your program. */ -WS_DLL_LOCAL +WS_DLL_PUBLIC void wmem_init(void); @@ -207,7 +207,7 @@ wmem_init(void); * functions, usually at the very end of your program. This function will not * destroy outstanding allocators, you must do that yourself. */ -WS_DLL_LOCAL +WS_DLL_PUBLIC void wmem_cleanup(void); |