diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-23 21:33:09 -0700 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-06-24 17:13:09 +0000 |
| commit | d406b28ebb77dab7aab2fbc9e37b4e4d2c2b3323 (patch) | |
| tree | 4a3020be32baa9bcf56c1f016e1bd1a178603589 /epan/nghttp2 | |
| parent | 17c59f5090cfac230723ee7f31c7af061fe7d60b (diff) | |
| download | wireshark-d406b28ebb77dab7aab2fbc9e37b4e4d2c2b3323.tar.gz | |
Don't export libnghttp2 routines outside libwireshark.
Hopefully this will fix build issues that popped up on Windows, as well
as making the library a bit cleaner.
Change-Id: I5b5266af4b41e10aba32abdb46bfe811ab11b45d
Reviewed-on: https://code.wireshark.org/review/9087
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/nghttp2')
| -rw-r--r-- | epan/nghttp2/nghttp2.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/epan/nghttp2/nghttp2.h b/epan/nghttp2/nghttp2.h index 6cf04a48b7..25becb638b 100644 --- a/epan/nghttp2/nghttp2.h +++ b/epan/nghttp2/nghttp2.h @@ -50,6 +50,17 @@ extern "C" { #include "nghttp2ver.h" +/* + * When we're building this as part of Wireshark, we want to treat + * all these routines as internal to libwireshark. + */ +#if 1 +#include "ws_symbol_export.h" + +#define NGHTTP2_EXTERN WS_DLL_LOCAL + +#else + #ifdef NGHTTP2_STATICLIB #define NGHTTP2_EXTERN #elif defined(WIN32) @@ -62,6 +73,8 @@ extern "C" { #define NGHTTP2_EXTERN #endif /* !defined(WIN32) */ +#endif /* 1 */ + /** * @macro * |