1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
|
diff --color -uwr a/src/packet-sapdiag.c b/src/packet-sapdiag.c
--- a/src/packet-sapdiag.c 2021-11-15 14:44:46.919384377 -0500
+++ b/src/packet-sapdiag.c 2021-11-15 14:45:13.521326805 -0500
@@ -19,8 +19,6 @@
# ==============
*/
-#include "config.h"
-
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
diff --color -uwr a/src/packet-sapenqueue.c b/src/packet-sapenqueue.c
--- a/src/packet-sapenqueue.c 2021-11-15 14:44:46.926051530 -0500
+++ b/src/packet-sapenqueue.c 2021-11-15 14:45:41.673382391 -0500
@@ -19,8 +19,6 @@
# ==============
*/
-#include "config.h"
-
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
diff --color -uwr a/src/packet-saphdb.c b/src/packet-saphdb.c
--- a/src/packet-saphdb.c 2021-11-15 14:44:46.926051530 -0500
+++ b/src/packet-saphdb.c 2021-11-15 14:45:40.063264824 -0500
@@ -19,8 +19,6 @@
# ==============
*/
-#include "config.h"
-
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
diff --color -uwr a/src/packet-sapigs.c b/src/packet-sapigs.c
--- a/src/packet-sapigs.c 2021-11-15 14:44:46.926051530 -0500
+++ b/src/packet-sapigs.c 2021-11-15 14:45:38.263133384 -0500
@@ -21,8 +21,6 @@
# ==============
*/
-#include "config.h"
-
#include <inttypes.h>
#include <stdlib.h>
diff --color -uwr a/src/packet-sapms.c b/src/packet-sapms.c
--- a/src/packet-sapms.c 2021-11-15 14:44:46.929385107 -0500
+++ b/src/packet-sapms.c 2021-11-15 14:45:36.192982227 -0500
@@ -19,8 +19,6 @@
# ==============
*/
-#include "config.h"
-
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
diff --color -uwr a/src/packet-sapprotocol.c b/src/packet-sapprotocol.c
--- a/src/packet-sapprotocol.c 2021-11-15 14:44:46.929385107 -0500
+++ b/src/packet-sapprotocol.c 2021-11-15 14:45:50.033992865 -0500
@@ -19,8 +19,6 @@
# ==============
*/
-#include "config.h"
-
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
diff --color -uwr a/src/packet-saprfc.c b/src/packet-saprfc.c
--- a/src/packet-saprfc.c 2021-11-15 14:44:46.929385107 -0500
+++ b/src/packet-saprfc.c 2021-11-15 14:45:56.504465335 -0500
@@ -19,8 +19,6 @@
# ==============
*/
-#include "config.h"
-
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
diff --color -uwr a/src/packet-saprouter.c b/src/packet-saprouter.c
--- a/src/packet-saprouter.c 2021-11-15 14:44:46.929385107 -0500
+++ b/src/packet-saprouter.c 2021-11-15 14:46:01.664842131 -0500
@@ -19,8 +19,6 @@
# ==============
*/
-#include "config.h"
-
#include <stdlib.h>
#include <epan/packet.h>
diff --color -uwr a/src/packet-sapsnc.c b/src/packet-sapsnc.c
--- a/src/packet-sapsnc.c 2021-11-15 14:44:46.936052261 -0500
+++ b/src/packet-sapsnc.c 2021-11-15 14:46:07.318588291 -0500
@@ -19,8 +19,6 @@
# ==============
*/
-#include "config.h"
-
#include <epan/packet.h>
#include <epan/expert.h>
diff --color -uwr a/tools/make-plugin-reg.py b/tools/make-plugin-reg.py
--- a/tools/make-plugin-reg.py 2021-11-15 14:41:01.532927169 -0500
+++ b/tools/make-plugin-reg.py 2021-11-15 15:06:41.652054264 -0500
@@ -102,14 +102,16 @@
reg_code += preamble
reg_code += """
-#include "config.h"
-
#include <gmodule.h>
+#include "ws_version.h"
+
/* plugins are DLLs */
#define WS_BUILD_DLL
#include "ws_symbol_export.h"
+#define HAVE_PLUGINS
+
"""
if registertype == "plugin":
@@ -130,8 +132,8 @@
reg_code += """
WS_DLL_PUBLIC_DEF const gchar plugin_version[] = PLUGIN_VERSION;
-WS_DLL_PUBLIC_DEF const int plugin_want_major = VERSION_MAJOR;
-WS_DLL_PUBLIC_DEF const int plugin_want_minor = VERSION_MINOR;
+WS_DLL_PUBLIC_DEF const int plugin_want_major = WIRESHARK_VERSION_MAJOR;
+WS_DLL_PUBLIC_DEF const int plugin_want_minor = WIRESHARK_VERSION_MINOR;
WS_DLL_PUBLIC void plugin_register(void);
|