3 files changed, 9 insertions, 9 deletions
diff --git a/tools/make-dissector-reg b/tools/make-dissector-reg
index a4552884cf..6233561c4a 100755
--- a/tools/make-dissector-reg
+++ b/tools/make-dissector-reg
@@ -47,11 +47,11 @@ then
 #include "ws_symbol_export.h"
 
 #ifndef ENABLE_STATIC
-WS_DLL_PUBLIC_NOEXTERN const gchar version[] = VERSION;
+WS_DLL_PUBLIC_DEF const gchar version[] = VERSION;
 
 /* Start the functions we need for the plugin stuff */
 
-WS_DLL_PUBLIC_NOEXTERN void
+WS_DLL_PUBLIC_DEF void
 plugin_register (void)
 {
 EOF
@@ -119,7 +119,7 @@ echo '}' >>${outfile}-tmp
 if [ "$registertype" = plugin ]
 then
 	cat <<"EOF" >>${outfile}-tmp
-WS_DLL_PUBLIC_NOEXTERN void
+WS_DLL_PUBLIC_DEF void
 plugin_reg_handoff(void)
 {
 EOF
diff --git a/tools/make-dissector-reg.py b/tools/make-dissector-reg.py
index 8e1134d19e..150097204a 100755
--- a/tools/make-dissector-reg.py
+++ b/tools/make-dissector-reg.py
@@ -195,11 +195,11 @@ if registertype == "plugin" or registertype == "plugin_wtap":
 #include "ws_symbol_export.h"
 
 #ifndef ENABLE_STATIC
-WS_DLL_PUBLIC_NOEXTERN const gchar version[] = VERSION;
+WS_DLL_PUBLIC_DEF const gchar version[] = VERSION;
 
 /* Start the functions we need for the plugin stuff */
 
-WS_DLL_PUBLIC_NOEXTERN void
+WS_DLL_PUBLIC_DEF void
 plugin_register (void)
 {
 """
@@ -223,7 +223,7 @@ reg_code += "}\n"
 # Make the routine to register all protocol handoffs
 if registertype == "plugin" or registertype == "plugin_wtap":
 	reg_code += """
-WS_DLL_PUBLIC_NOEXTERN void
+WS_DLL_PUBLIC_DEF void
 plugin_reg_handoff(void)
 {
 """
@@ -246,7 +246,7 @@ if registertype == "plugin":
 	reg_code += "#endif\n"
 elif registertype == "plugin_wtap":
 	reg_code += """
-WS_DLL_PUBLIC_NOEXTERN void
+WS_DLL_PUBLIC_DEF void
 register_wtap_module(void)
 {
 """
diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py
index def0b30214..41048415d8 100755
--- a/tools/wireshark_gen.py
+++ b/tools/wireshark_gen.py
@@ -1976,7 +1976,7 @@ static guint32  boundary = GIOP_HEADER_SIZE;  /* initial value */"""
     template_plugin_register = """
 #if 0
 
-WS_DLL_PUBLIC_NOEXTERN void
+WS_DLL_PUBLIC_DEF void
 plugin_register(void)
 {
    if (proto_@dissector_name@ == -1) {
@@ -1984,7 +1984,7 @@ plugin_register(void)
    }
 }
 
-WS_DLL_PUBLIC_NOEXTERN void
+WS_DLL_PUBLIC_DEF void
 plugin_reg_handoff(void){
    proto_register_handoff_giop_@dissector_name@();
 }