aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/opcua
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/opcua')
-rw-r--r--plugins/opcua/Makefile.nmake6
-rw-r--r--plugins/opcua/opcua.c2
-rw-r--r--plugins/opcua/opcua_application_layer.c2
-rw-r--r--plugins/opcua/opcua_complextypeparser.c2
-rw-r--r--plugins/opcua/opcua_complextypeparser.h2
-rw-r--r--plugins/opcua/opcua_enumparser.c2
-rw-r--r--plugins/opcua/opcua_enumparser.h2
-rw-r--r--plugins/opcua/opcua_hfindeces.c2
-rw-r--r--plugins/opcua/opcua_hfindeces.h2
-rw-r--r--plugins/opcua/opcua_identifiers.h2
-rw-r--r--plugins/opcua/opcua_security_layer.c2
-rw-r--r--plugins/opcua/opcua_serviceparser.c2
-rw-r--r--plugins/opcua/opcua_serviceparser.h2
-rw-r--r--plugins/opcua/opcua_servicetable.c2
-rw-r--r--plugins/opcua/opcua_simpletypes.c2
-rw-r--r--plugins/opcua/opcua_transport_layer.c2
16 files changed, 18 insertions, 18 deletions
diff --git a/plugins/opcua/Makefile.nmake b/plugins/opcua/Makefile.nmake
index c265b1cbc5..9ed986ce39 100644
--- a/plugins/opcua/Makefile.nmake
+++ b/plugins/opcua/Makefile.nmake
@@ -1,5 +1,5 @@
# Makefile.nmake
-# nmake file for OpcUa plugin
+# nmake file for Wireshark plugin
#
# $Id$
#
@@ -12,10 +12,10 @@ include Makefile.common
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
-LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
+LDFLAGS = $(PLUGIN_LDFLAGS)
!IFDEF ENABLE_LIBWIRESHARK
-LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\epan\dissectors\dissectors.lib
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
diff --git a/plugins/opcua/opcua.c b/plugins/opcua/opcua.c
index 920a29862a..55a2b472d5 100644
--- a/plugins/opcua/opcua.c
+++ b/plugins/opcua/opcua.c
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
#include <epan/emem.h>
#include <epan/dissectors/packet-tcp.h>
diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/opcua/opcua_application_layer.c
index 4f68cccded..ae3193c803 100644
--- a/plugins/opcua/opcua_application_layer.c
+++ b/plugins/opcua/opcua_application_layer.c
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
#include "opcua_simpletypes.h"
diff --git a/plugins/opcua/opcua_complextypeparser.c b/plugins/opcua/opcua_complextypeparser.c
index b1ee709af7..dc1034fb43 100644
--- a/plugins/opcua/opcua_complextypeparser.c
+++ b/plugins/opcua/opcua_complextypeparser.c
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
#include "opcua_complextypeparser.h"
#include "opcua_enumparser.h"
diff --git a/plugins/opcua/opcua_complextypeparser.h b/plugins/opcua/opcua_complextypeparser.h
index a7f87b0cd9..cb689d94e1 100644
--- a/plugins/opcua/opcua_complextypeparser.h
+++ b/plugins/opcua/opcua_complextypeparser.h
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
void parseReferenceNode(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szFieldName);
diff --git a/plugins/opcua/opcua_enumparser.c b/plugins/opcua/opcua_enumparser.c
index 5f161adc8b..a7ce747ef4 100644
--- a/plugins/opcua/opcua_enumparser.c
+++ b/plugins/opcua/opcua_enumparser.c
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
#include "opcua_enumparser.h"
diff --git a/plugins/opcua/opcua_enumparser.h b/plugins/opcua/opcua_enumparser.h
index 9838e53b6d..f1518a6aeb 100644
--- a/plugins/opcua/opcua_enumparser.h
+++ b/plugins/opcua/opcua_enumparser.h
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
void parseNodeClass(proto_tree *tree, tvbuff_t *tvb, gint *pOffset);
diff --git a/plugins/opcua/opcua_hfindeces.c b/plugins/opcua/opcua_hfindeces.c
index 82055640f0..40f5252456 100644
--- a/plugins/opcua/opcua_hfindeces.c
+++ b/plugins/opcua/opcua_hfindeces.c
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
int hf_opcua_TestId = -1;
diff --git a/plugins/opcua/opcua_hfindeces.h b/plugins/opcua/opcua_hfindeces.h
index aec6f06088..cd8a14038f 100644
--- a/plugins/opcua/opcua_hfindeces.h
+++ b/plugins/opcua/opcua_hfindeces.h
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
extern int hf_opcua_TestId;
diff --git a/plugins/opcua/opcua_identifiers.h b/plugins/opcua/opcua_identifiers.h
index 67569810b5..d3d66962a6 100644
--- a/plugins/opcua/opcua_identifiers.h
+++ b/plugins/opcua/opcua_identifiers.h
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
/* declare service parser function prototype */
diff --git a/plugins/opcua/opcua_security_layer.c b/plugins/opcua/opcua_security_layer.c
index fc19dc57f6..44da344b9a 100644
--- a/plugins/opcua/opcua_security_layer.c
+++ b/plugins/opcua/opcua_security_layer.c
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
#include "opcua_application_layer.h"
#include "opcua_simpletypes.h"
diff --git a/plugins/opcua/opcua_serviceparser.c b/plugins/opcua/opcua_serviceparser.c
index db9adf402d..b8bed4dec5 100644
--- a/plugins/opcua/opcua_serviceparser.c
+++ b/plugins/opcua/opcua_serviceparser.c
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
#include "opcua_serviceparser.h"
#include "opcua_complextypeparser.h"
diff --git a/plugins/opcua/opcua_serviceparser.h b/plugins/opcua/opcua_serviceparser.h
index 2445f2aa65..c1db9f4178 100644
--- a/plugins/opcua/opcua_serviceparser.h
+++ b/plugins/opcua/opcua_serviceparser.h
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
void parseTestStackRequest(proto_tree *tree, tvbuff_t *tvb, gint *pOffset);
diff --git a/plugins/opcua/opcua_servicetable.c b/plugins/opcua/opcua_servicetable.c
index 8b9180d95f..bf42699c13 100644
--- a/plugins/opcua/opcua_servicetable.c
+++ b/plugins/opcua/opcua_servicetable.c
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
#include "opcua_identifiers.h"
#include "opcua_serviceparser.h"
diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c
index 1411226cc5..6540c3be4e 100644
--- a/plugins/opcua/opcua_simpletypes.c
+++ b/plugins/opcua/opcua_simpletypes.c
@@ -26,7 +26,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
#include <epan/dissectors/packet-windows-common.h>
#include "opcua_simpletypes.h"
diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/opcua/opcua_transport_layer.c
index b96e92adff..6327d8e929 100644
--- a/plugins/opcua/opcua_transport_layer.c
+++ b/plugins/opcua/opcua_transport_layer.c
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
#include <epan/packet.h>
#include "opcua_security_layer.h"
#include "opcua_application_layer.h"