aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--config.h.win3211
-rw-r--r--plugins/asn1/Makefile.nmake2
-rw-r--r--plugins/docsis/Makefile.nmake2
-rw-r--r--plugins/easy_codec/Makefile.nmake2
-rw-r--r--plugins/ethercat/Makefile.nmake2
-rw-r--r--plugins/giop/Makefile.nmake2
-rw-r--r--plugins/gryphon/Makefile.nmake2
-rw-r--r--plugins/irda/Makefile.nmake2
-rw-r--r--plugins/m2m/Makefile.nmake2
-rw-r--r--plugins/mate/Makefile.nmake2
-rw-r--r--plugins/opcua/Makefile.nmake2
-rw-r--r--plugins/profinet/Makefile.nmake2
-rw-r--r--plugins/sercosiii/Makefile.nmake2
-rw-r--r--plugins/stats_tree/Makefile.nmake2
-rw-r--r--plugins/tpg/Makefile.nmake2
-rw-r--r--plugins/unistim/Makefile.nmake2
-rw-r--r--plugins/wimax/Makefile.nmake2
-rw-r--r--plugins/wimaxasncp/Makefile.nmake2
19 files changed, 18 insertions, 29 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16c4915bf0..7c66bba4f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,7 +232,7 @@ if(APPLE)
endif()
if(WIN32)
- add_definitions(-DHAVE_WIN32_LIBWIRESHARK_LIB -D_NEED_VAR_IMPORT_)
+ add_definitions(-D_NEED_VAR_IMPORT_)
set(WS_VAR_IMPORT "__declspec(dllimport) extern")
# Disable deprecation
diff --git a/config.h.win32 b/config.h.win32
index eff90988ca..6cc50556c1 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -40,17 +40,6 @@
#define YYTEXT_POINTER 1
#define HAVE_PLUGINS 1
-#define PLUGINS_NEED_ADDRESS_TABLE 1
-
-/* Plugins can also use the import library of libwireshark.dll instead
- of the old API. In that case we undefine PLUGINS_NEED_ADDRESS_TABLE
- for the plugin. We don't undefine PLUGINS_NEED_ADDRESS_TABLE globally.
- Thus Wireshark will be still able to load plugins using the old API.
- The macro HAVE_WIN32_LIBWIRESHARK_LIB has to be defined in plugin's
- makefile.nmake. A template is available in doc/README.plugins */
-#ifdef HAVE_WIN32_LIBWIRESHARK_LIB
-#undef PLUGINS_NEED_ADDRESS_TABLE
-#endif
/* #undef HAVE_SA_LEN */
diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index 6bdc36773d..8207592f65 100644
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index 3cf4dc5b3e..c01e58bfe7 100644
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/easy_codec/Makefile.nmake b/plugins/easy_codec/Makefile.nmake
index 3d04e32b34..c651fa648c 100644
--- a/plugins/easy_codec/Makefile.nmake
+++ b/plugins/easy_codec/Makefile.nmake
@@ -21,7 +21,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
CODEC_OBJECTS = $(CODEC_SRC:.c=.obj)
diff --git a/plugins/ethercat/Makefile.nmake b/plugins/ethercat/Makefile.nmake
index 810e87397e..1a360e370b 100644
--- a/plugins/ethercat/Makefile.nmake
+++ b/plugins/ethercat/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index 13eaf65a6a..313aaded88 100644
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
OBJECTS=packet-cosnaming.obj packet-coseventcomm.obj packet-tango.obj packet-parlay.obj
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index 3cf4dc5b3e..c01e58bfe7 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index 3cf4dc5b3e..c01e58bfe7 100644
--- a/plugins/irda/Makefile.nmake
+++ b/plugins/irda/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/m2m/Makefile.nmake b/plugins/m2m/Makefile.nmake
index ee662b26ab..4f7eb894d7 100644
--- a/plugins/m2m/Makefile.nmake
+++ b/plugins/m2m/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index bf33acc2d9..64eb838d0e 100644
--- a/plugins/mate/Makefile.nmake
+++ b/plugins/mate/Makefile.nmake
@@ -25,7 +25,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/opcua/Makefile.nmake b/plugins/opcua/Makefile.nmake
index 3cf4dc5b3e..c01e58bfe7 100644
--- a/plugins/opcua/Makefile.nmake
+++ b/plugins/opcua/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake
index 3cf4dc5b3e..c01e58bfe7 100644
--- a/plugins/profinet/Makefile.nmake
+++ b/plugins/profinet/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/sercosiii/Makefile.nmake b/plugins/sercosiii/Makefile.nmake
index 3cf4dc5b3e..c01e58bfe7 100644
--- a/plugins/sercosiii/Makefile.nmake
+++ b/plugins/sercosiii/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake
index 89fc5c9376..79efff19e7 100644
--- a/plugins/stats_tree/Makefile.nmake
+++ b/plugins/stats_tree/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
TAP_OBJECTS = $(TAP_SRC:.c=.obj)
diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake
index 5026083b65..616c93b778 100644
--- a/plugins/tpg/Makefile.nmake
+++ b/plugins/tpg/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
OBJECTS=packet-mate.obj\
mate_setup.obj\
diff --git a/plugins/unistim/Makefile.nmake b/plugins/unistim/Makefile.nmake
index 3cf4dc5b3e..c01e58bfe7 100644
--- a/plugins/unistim/Makefile.nmake
+++ b/plugins/unistim/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/wimax/Makefile.nmake b/plugins/wimax/Makefile.nmake
index 37220cbb5c..8b05b5cce3 100644
--- a/plugins/wimax/Makefile.nmake
+++ b/plugins/wimax/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake
index 4d3fcf97b9..f5305c0c47 100644
--- a/plugins/wimaxasncp/Makefile.nmake
+++ b/plugins/wimaxasncp/Makefile.nmake
@@ -25,7 +25,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 16:12:29 +0000