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>

diff --git a/epan/nghttp2/nghttp2.h b/epan/nghttp2/nghttp2.h
index 6cf04a48b7d51057b1041b74c20aae95102cf9b0..25becb638b01a28dfd31f8cb2c20cf95f5c69d66 100644 (file)
--- 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
  *