Use '#if 0 ... #endif' rather than /** ... **/ to comment out

 unused hf[] entries (which I should have done in the first place).


svn path=/trunk/; revision=47391

23 files changed, 106 insertions, 106 deletions

diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c
index 90a610c447..aee049fb21 100644
--- a/epan/dissectors/packet-ismacryp.c
+++ b/epan/dissectors/packet-ismacryp.c
@@ -708,27 +708,27 @@ void proto_register_ismacryp (void)
 	* {&(field id), {name, abbrev, type, display, strings, bitmask, blurb, HFILL}}.
 	*/
 	static hf_register_info hf[] = {
-/**
+#if 0
 		{ &hf_ismacryp,
 		  { "Data", "ismacryp.data", FT_NONE, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
-**/
+#endif
 
-/**
+#if 0
 		{ &hf_ismacryp_length,
-		  { "Total Length", "ismacryp.len", FT_UINT16, BASE_DEC, NULL, 0x0,	/-* length 2 bytes, print as decimal value *-/
+		  { "Total Length", "ismacryp.len", FT_UINT16, BASE_DEC, NULL, 0x0,	/* length 2 bytes, print as decimal value */
 		    NULL, HFILL }},
-**/
+#endif
 
 		{ &hf_ismacryp_header,
 		  { "AU Header", "ismacryp.header", FT_NONE, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 
-/**
+#if 0
 		{ &hf_ismacryp_header_length,
 		  { "Header Length", "ismacryp.header.length", FT_UINT16, BASE_DEC, NULL, 0x0,
 		    NULL, HFILL }},
-**/
+#endif
 
 		{ &hf_ismacryp_au_headers_length,
 		  { "AU Headers Length", "ismacryp.au_headers.length", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -738,33 +738,33 @@ void proto_register_ismacryp (void)
 		  { "Header Byte", "ismacryp.header.byte", FT_NONE, BASE_NONE, NULL, 0x0, /* 1 byte */
 		    NULL, HFILL }},
 
-/**
+#if 0
 		{ &hf_ismacryp_version,
-		  { "Version", "ismacryp.version", FT_UINT8, BASE_HEX, NULL, 0x0, 	/-* version 1 byte *-/
+		  { "Version", "ismacryp.version", FT_UINT8, BASE_HEX, NULL, 0x0, 	/* version 1 byte */
 		    NULL, HFILL }},
-**/
+#endif
 
 		{ &hf_ismacryp_message,
 		  { "Message", "ismacryp.message", FT_NONE, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 
-/**
+#if 0
 		{ &hf_ismacryp_message_length,
-		  { "Message Length", "ismacryp.message.len", FT_UINT16, BASE_DEC, NULL, 0x0,	/-* length 2 bytes, print as decimal value *-/
+		  { "Message Length", "ismacryp.message.len", FT_UINT16, BASE_DEC, NULL, 0x0,	/* length 2 bytes, print as decimal value */
 		    NULL, HFILL }},
-**/
+#endif
 
-/**
+#if 0
 		{ &hf_ismacryp_parameter,
 		  { "Parameter", "ismacryp.parameter", FT_NONE, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
-**/
+#endif
 
-/**
+#if 0
 		{ &hf_ismacryp_parameter_length,
-		  { "Parameter Length", "ismacryp.parameter.len", FT_UINT16, BASE_DEC, NULL, 0x0, /-* length 2 bytes, print as decimal value *-/
+		  { "Parameter Length", "ismacryp.parameter.len", FT_UINT16, BASE_DEC, NULL, 0x0, /* length 2 bytes, print as decimal value */
 		    NULL, HFILL }},
-**/
+#endif
 
 		{ &hf_ismacryp_iv,
 		  { "IV", "ismacryp.iv", FT_BYTES, BASE_NONE, NULL, 0x0, /* variable length */
@@ -778,11 +778,11 @@ void proto_register_ismacryp (void)
 		  { "Key Indicator", "ismacryp.key_indicator", FT_BYTES, BASE_NONE, NULL, 0x0, /* variable length */
 		    NULL, HFILL }},
 
-/**
+#if 0
 		{ &hf_ismacryp_parameter_value,
 		  { "Parameter Value", "ismacryp.parameter.value", FT_NONE, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
-**/
+#endif
 
 		{ &hf_ismacryp_au_size,
 		  { "AU size", "ismacryp.au.size", FT_UINT64, BASE_DEC, NULL, 0x0,
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c
index a03115aba0..2e169767f2 100644
--- a/epan/dissectors/packet-ismp.c
+++ b/epan/dissectors/packet-ismp.c
@@ -537,13 +537,13 @@ proto_register_ismp(void)
 
 /* Setup list of header fields  See Section 1.6.1 for details*/
 	static hf_register_info hf[] = {
-/**
+#if 0
 		{ &hf_ismp,
 			{ "ISMP", "ismp",
 			FT_PROTOCOL, BASE_NONE, NULL, 0x0,
 			"Inter Switch Message Protocol", HFILL }
 		},
-**/
+#endif
 		{ &hf_ismp_version,
 			{ "Version",           "ismp.version",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index f90f0906f6..96be40c0ce 100644
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -905,12 +905,12 @@ void proto_register_iuup(void) {
         { &hf_iuup_data_pdu_type, { "RFCI Data Pdu Type", "iuup.data_pdu_type", FT_UINT8, BASE_HEX, VALS(iuup_payload_pdu_type),0xF0,NULL,HFILL}},
 
         { &hf_iuup_spare_03, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0x03,NULL,HFILL}},
-/**
+#if 0
         { &hf_iuup_spare_0f, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0x0f,NULL,HFILL}},
-**/
-/**
+#endif
+#if 0
         { &hf_iuup_spare_c0, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0xc0,NULL,HFILL}},
-**/
+#endif
         { &hf_iuup_spare_e0, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0xe0,NULL,HFILL}},
         { &hf_iuup_spare_ff, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0xff,NULL,HFILL}},
         { &hf_iuup_spare_bytes, { "Spare", "iuup.spare_bytes", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}},
diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c
index 47ddecfe6e..b252134f90 100644
--- a/epan/dissectors/packet-juniper.c
+++ b/epan/dissectors/packet-juniper.c
@@ -1362,11 +1362,11 @@ void
 proto_register_juniper(void)
 {
   static hf_register_info hf[] = {
-/**
+#if 0
     { &hf_juniper_magic,
       { "Magic Number", "juniper.magic-number", FT_UINT24, BASE_HEX,
         NULL, 0x0, NULL, HFILL }},
-**/
+#endif
     { &hf_juniper_direction,
       { "Direction", "juniper.direction", FT_UINT8, BASE_HEX,
         VALS(juniper_direction_vals), 0x0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index b7785ffc5d..fefad5149f 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -2267,12 +2267,12 @@ void proto_register_jxta(void)
          {"Element Content Length", "jxta.message.element.content.length", FT_UINT64, BASE_DEC, NULL, 0x0,
           "JXTA Message Element Content Length", HFILL}
          },
-/**
+#if 0
         {&hf_jxta_element_content,
          {"Element Content", "jxta.message.element.content", FT_BYTES, BASE_NONE, NULL, 0x0,
           "JXTA Message Element Content", HFILL}
          },
-**/
+#endif
     };
 
     proto_jxta = proto_register_protocol("JXTA P2P", "JXTA", "jxta");
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
index 8ae20cef46..8491f97514 100644
--- a/epan/dissectors/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
@@ -3063,18 +3063,18 @@ void
 proto_register_ldp(void)
 {
     static hf_register_info hf[] = {
-/**
+#if 0
         { &hf_ldp_req,
-          /-* Change the following to the type you need *-/
+          /* Change the following to the type you need */
           { "Request", "ldp.req", FT_BOOLEAN, BASE_NONE,
             NULL, 0x0, NULL, HFILL }},
-**/
+#endif
 
-/**
+#if 0
         { &hf_ldp_rsp,
           { "Response", "ldp.rsp", FT_BOOLEAN, BASE_NONE,
             NULL, 0x0, NULL, HFILL }},
-**/
+#endif
 
         { &hf_ldp_version,
           { "Version", "ldp.hdr.version", FT_UINT16, BASE_DEC,
@@ -3709,11 +3709,11 @@ proto_register_ldp(void)
           { "Resource Class", "ldp.msg.tlv.resource_class", FT_UINT32, BASE_HEX,
             NULL, 0, "Resource Class (Color)", HFILL}},
 
-/**
+#if 0
         { &hf_ldp_tlv_diffserv,
           { "Diff-Serv TLV", "ldp.msg.tlv.diffserv", FT_NONE, BASE_NONE,
             NULL, 0, "Diffserv TLV", HFILL}},
-**/
+#endif
 
         { &hf_ldp_tlv_diffserv_type,
           { "LSP Type", "ldp.msg.tlv.diffserv.type", FT_UINT8, BASE_DEC,
diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c
index 46039e5272..e55aeb264c 100644
--- a/epan/dissectors/packet-linx.c
+++ b/epan/dissectors/packet-linx.c
@@ -773,11 +773,11 @@ proto_register_linx(void)
 		{ &hf_linx_rlnh_msg_reserved, /* in RLNH */
 		        { "RLNH msg reserved", "linx.rlnh_msg_reserved", FT_UINT32, BASE_DEC, NULL, 0xffffff00, "RLNH message reserved", HFILL },
 		},
-/**
-		{ &hf_linx_rlnh_linkaddr, /-* in RLNH *-/
+#if 0
+		{ &hf_linx_rlnh_linkaddr, /* in RLNH */
 			{ "RLNH linkaddr", "linx.rlnh_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH linkaddress", HFILL },
 		},
-**/
+#endif
 		{ &hf_linx_rlnh_src_linkaddr, /* in RLNH */
 			{ "RLNH src linkaddr", "linx.rlnh_src_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH source linkaddress", HFILL },
 		},
@@ -979,11 +979,11 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 proto_register_linx_tcp(void)
 {
 	static hf_register_info hf[] = {
-/**
+#if 0
 		{ &hf_linx_tcp_reserved,
 			{ "Reserved", "linxtcp.reserved", FT_UINT32, BASE_DEC, NULL, 0x00007FFF, "TCP CM reserved", HFILL },
 		},
-**/
+#endif
 		{ &hf_linx_tcp_oob,
 			{ "Out-of-band", "linxtcp.oob", FT_UINT32, BASE_DEC, NULL, 0x00008000, "TCP CM oob", HFILL },
 		},
@@ -1013,11 +1013,11 @@ proto_register_linx_tcp(void)
 		{ &hf_linx_tcp_rlnh_msg_reserved,
 			{ "RLNH msg reserved", "linxtcp.rlnh_msg_reserved", FT_UINT32, BASE_DEC, NULL, 0xffffff00, "RLNH message reserved", HFILL },
 		},
-/**
+#if 0
 		{ &hf_linx_tcp_rlnh_linkaddr,
 			{ "RLNH linkaddr", "linxtcp.rlnh_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH linkaddress", HFILL },
 		},
-**/
+#endif
 		{ &hf_linx_tcp_rlnh_src_linkaddr,
 		        { "RLNH src linkaddr", "linxtcp.rlnh_src_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH source linkaddress", HFILL },
 		},
diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c
index 6907477352..3bdb7ee797 100644
--- a/epan/dissectors/packet-lon.c
+++ b/epan/dissectors/packet-lon.c
@@ -678,13 +678,13 @@ proto_register_lon(void)
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }
 		},
-/**
+#if 0
 		{&hf_lon_checksum,
 			{"Checksum", "lon.chksum",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }
 		}
-**/
+#endif
 	};
 
 	static gint *ett[] =
diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c
index 88628d66d5..024368e997 100644
--- a/epan/dissectors/packet-ltp.c
+++ b/epan/dissectors/packet-ltp.c
@@ -836,12 +836,12 @@ proto_register_ltp(void)
 		  {"Report serial number","ltp.data.rpt",
 		  FT_UINT64,BASE_DEC,NULL, 0x0, NULL, HFILL}
 	  },
-/**
+#if 0
 	  {&hf_ltp_data_clidata,
 		  {"Client service data","ltp.data.data",
 		  FT_BYTES,BASE_NONE,NULL, 0x0, NULL, HFILL}
 	  },
-**/
+#endif
 	  {&hf_ltp_rpt_sno,
 		  {"Report serial number","ltp.rpt.sno",
 		  FT_UINT64,BASE_DEC,NULL, 0x0, NULL, HFILL}
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index dc367d4285..de7fd75217 100644
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@@ -496,11 +496,11 @@ proto_register_lwapp(void)
         { &hf_lwapp_snr,
           { "SNR","lwapp.snr", FT_UINT8, BASE_HEX,
             NULL, 0x0, NULL, HFILL }},
-/**
+#if 0
         { &hf_lwapp_control,
           { "Control Data (not dissected yet)","lwapp.control", FT_BYTES, BASE_NONE,
             NULL, 0x0, NULL, HFILL }},
-**/
+#endif
         { &hf_lwapp_control_mac,
           { "AP Identity", "lwapp.apid", FT_ETHER, BASE_NONE, NULL, 0x0,
               "Access Point Identity", HFILL }},
diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c
index aeb0eefb90..532ee766fe 100644
--- a/epan/dissectors/packet-lwres.c
+++ b/epan/dissectors/packet-lwres.c
@@ -1107,11 +1107,11 @@ proto_register_lwres(void)
           { "Real doname name", "lwres.realname", FT_STRING, BASE_NONE, NULL, 0x0,
             "lwres realname", HFILL }},
 
-/**
+#if 0
         { &hf_a_record,
           { "IPv4 Address", "lwres.arecord", FT_UINT32, BASE_DEC, NULL, 0x0,
             "lwres arecord", HFILL }},
-**/
+#endif
 
         { &hf_a_rec_len,
           { "Length", "lwres.areclen", FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index e4f539fef0..943f096462 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -1985,9 +1985,9 @@ proto_register_m3ua(void)
     { &hf_parameter_length,                 { "Parameter length",             "m3ua.parameter_length",                      FT_UINT16, BASE_DEC,  NULL,                                         0x0, NULL,				HFILL } },
     { &hf_parameter_value,                  { "Parameter value",              "m3ua.parameter_value",                       FT_BYTES,  BASE_NONE, NULL,                                         0x0, NULL,				HFILL } },
     { &hf_parameter_padding,                { "Padding",                      "m3ua.parameter_padding",                     FT_BYTES,  BASE_NONE, NULL,                                         0x0, NULL,				HFILL } },
-/**
+#if 0
     { &hf_parameter_trailer,                { "Trailer",                      "m3ua.paramter_trailer",                      FT_BYTES,  BASE_NONE, NULL,                                         0x0, NULL,				HFILL } },
-**/
+#endif
     { &hf_network_appearance,               { "Network appearance",           "m3ua.network_appearance",                    FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL,				HFILL } },
     { &hf_info_string,                      { "Info string",                  "m3ua.info_string",                           FT_STRING, BASE_NONE, NULL,                                         0x0, NULL,				HFILL } },
     { &hf_routing_context,                  { "Routing context",              "m3ua.routing_context",                       FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL,				HFILL } },
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index f23a260057..d8128ae7bc 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -3375,11 +3375,11 @@ proto_register_megaco(void)
         { &hf_megaco_audit_descriptor,
           { "Audit Descriptor", "megaco.audit", FT_NONE, BASE_NONE, NULL, 0x0,
             "Audit Descriptor of the megaco Command", HFILL }},
-/**
+#if 0
         { &hf_megaco_command_line,
           { "Command line", "megaco.command_line", FT_STRING, BASE_NONE, NULL, 0x0,
             "Commands of this message", HFILL }},
-**/
+#endif
         { &hf_megaco_command,
           { "Command", "megaco.command", FT_STRING, BASE_NONE, NULL, 0x0,
             "Command of this message", HFILL }},
@@ -3398,26 +3398,26 @@ proto_register_megaco(void)
         { &hf_megaco_Event_Buffer_Control,
           { "Event Buffer Control", "megaco.eventbuffercontrol", FT_STRING, BASE_NONE, NULL, 0x0,
             "Event Buffer Control in Termination State Descriptor", HFILL }},
-/**
+#if 0
         { &hf_megaco_events_descriptor,
           { "Events Descriptor", "megaco.events", FT_STRING, BASE_NONE, NULL, 0x0,
             "Events Descriptor of the megaco Command", HFILL }},
-**/
-/**
+#endif
+#if 0
         { &hf_megaco_Local_descriptor,
           { "Local Descriptor", "megaco.localdescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
             "Local Descriptor in Media Descriptor", HFILL }},
-**/
-/**
+#endif
+#if 0
         { &hf_megaco_LocalControl_descriptor,
           { "Local Control Descriptor", "megaco.localcontroldescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
             "Local Control Descriptor in Media Descriptor", HFILL }},
-**/
-/**
+#endif
+#if 0
         { &hf_megaco_media_descriptor,
           { "Media Descriptor", "megaco.media", FT_STRING, BASE_NONE, NULL, 0x0,
             "Media Descriptor of the megaco Command", HFILL }},
-**/
+#endif
         { &hf_megaco_modem_descriptor,
           { "Modem Descriptor", "megaco.modem", FT_STRING, BASE_NONE, NULL, 0x0,
             "Modem Descriptor of the megaco Command", HFILL }},
@@ -3427,22 +3427,22 @@ proto_register_megaco(void)
         { &hf_megaco_multiplex_descriptor,
           { "Multiplex Descriptor", "megaco.multiplex", FT_STRING, BASE_NONE, NULL, 0x0,
             "Multiplex Descriptor of the megaco Command", HFILL }},
-/**
+#if 0
         { &hf_megaco_observedevents_descriptor,
           { "Observed Events Descriptor", "megaco.observedevents", FT_STRING, BASE_NONE, NULL, 0x0,
             "Observed Events Descriptor of the megaco Command", HFILL }},
-**/
+#endif
         { &hf_megaco_packages_descriptor,
           { "Packages Descriptor", "megaco.packagesdescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }},
         { &hf_megaco_pkgdname,
           { "pkgdName", "megaco.pkgdname", FT_STRING, BASE_NONE, NULL, 0x0,
             "PackageName SLASH ItemID", HFILL }},
-/**
+#if 0
         { &hf_megaco_Remote_descriptor,
           { "Remote Descriptor", "megaco.remotedescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
             "Remote Descriptor in Media Descriptor", HFILL }},
-**/
+#endif
         { &hf_megaco_reserve_group,
           { "Reserve Group", "megaco.reservegroup", FT_STRING, BASE_NONE, NULL, 0x0,
             "Reserve Group on or off", HFILL }},
@@ -3464,19 +3464,19 @@ proto_register_megaco(void)
         { &hf_megaco_requestid,
           { "RequestID", "megaco.requestid", FT_STRING, BASE_NONE, NULL, 0x0,
             "RequestID in Events or Observedevents Descriptor", HFILL }},
-/**
+#if 0
         { &hf_megaco_servicechange_descriptor,
           { "Service Change Descriptor", "megaco.servicechange", FT_STRING, BASE_NONE, NULL, 0x0,
             "Service Change Descriptor of the megaco Command", HFILL }},
-**/
+#endif
         { &hf_megaco_Service_State,
           { "Service State", "megaco.servicestates", FT_STRING, BASE_NONE, NULL, 0x0,
             "Service States in Termination State Descriptor", HFILL }},
-/**
+#if 0
         { &hf_megaco_signal_descriptor,
           { "Signal Descriptor", "megaco.signal", FT_STRING, BASE_NONE, NULL, 0x0,
             "Signal Descriptor of the megaco Command", HFILL }},
-**/
+#endif
         { &hf_megaco_statistics_descriptor,
           { "Statistics Descriptor", "megaco.statistics", FT_STRING, BASE_NONE, NULL, 0x0,
             "Statistics Descriptor of the megaco Command", HFILL }},
@@ -3486,11 +3486,11 @@ proto_register_megaco(void)
         { &hf_megaco_termid,
           { "Termination ID", "megaco.termid", FT_STRING, BASE_NONE, NULL, 0x0,
             "Termination ID of this Command", HFILL }},
-/**
+#if 0
         { &hf_megaco_TerminationState_descriptor,
           { "Termination State Descriptor", "megaco.terminationstate", FT_STRING, BASE_NONE, NULL, 0x0,
             "Termination State Descriptor in Media Descriptor", HFILL }},
-**/
+#endif
         { &hf_megaco_topology_descriptor,
           { "Topology Descriptor", "megaco.topology", FT_STRING, BASE_NONE, NULL, 0x0,
             "Topology Descriptor of the megaco Command", HFILL }},
@@ -3506,11 +3506,11 @@ proto_register_megaco(void)
         { &hf_megaco_version,
           { "Version", "megaco.version", FT_STRING, BASE_NONE, NULL, 0x0,
             NULL, HFILL }},
-/**
+#if 0
         { &hf_megaco_h245,
           { "h245", "megaco.h245", FT_STRING, BASE_NONE, NULL, 0x0,
             "Embedded H.245 message", HFILL }},
-**/
+#endif
         { &hf_megaco_h223Capability,
           { "h223Capability", "megaco.h245.h223Capability", FT_NONE, BASE_NONE, NULL, 0,
             "megaco.h245.H223Capability", HFILL }},
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index 43e97bde11..aeb413aa14 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -1050,12 +1050,12 @@ void proto_register_mip(void)
         FT_BOOLEAN, 16, NULL, 16384,
         "Inform Mobile Node", HFILL }
     },
-/**
+#if 0
     { &hf_mip_rev_reserved2,
       { "Reserved",                 "mip.rev.reserved2",
         FT_UINT16, BASE_HEX, NULL, 0x3fff,
         NULL, HFILL}},
-**/
+#endif
     { &hf_mip_hda,
       { "Home Domain Address",      "mip.rev.hda",
         FT_IPv4, BASE_NONE, NULL, 0,
@@ -1081,12 +1081,12 @@ void proto_register_mip(void)
         FT_BOOLEAN, 16, NULL, 32768,
         "Inform Mobile Node", HFILL }
     },
-/**
+#if 0
     { &hf_mip_ack_reserved2,
       { "Reserved",                 "mip.ack.reserved2",
         FT_UINT16, BASE_HEX, NULL, 0x7fff,
         NULL, HFILL}},
-**/
+#endif
     { &hf_mip_dhaext_stype,
       { "DynHA Ext SubType",        "mip.ext.dynha.subtype",
         FT_UINT8, BASE_DEC, VALS(mip_dhaext_stypes), 0,
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index 1e0f683e30..0579cb67d2 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -3657,13 +3657,13 @@ proto_register_mip6(void)
         FT_UINT64, BASE_HEX, NULL, 0,
         NULL, HFILL }
     },
-/**
+#if 0
     { &hf_mip6_cot_token,
       { "Care-of Keygen Token", "mip6.cot.token",
         FT_UINT64, BASE_HEX, NULL, 0,
         NULL, HFILL }
     },
-**/
+#endif
 
     { &hf_mip6_bu_seqnr,
       { "Sequence number", "mip6.bu.seqnr",
diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c
index 5f846922fd..4914bf7b0e 100644
--- a/epan/dissectors/packet-mmse.c
+++ b/epan/dissectors/packet-mmse.c
@@ -1521,7 +1521,7 @@ proto_register_mmse(void)
 		HFILL
 	    }
 	},
-/**
+#if 0
 	{   &hf_mmse_content_type,
 	    {   "Data", "mmse.content_type",
 		FT_NONE, BASE_NONE, NULL, 0x00,
@@ -1529,7 +1529,7 @@ proto_register_mmse(void)
 		HFILL
 	    }
 	},
-**/
+#endif
 	{   &hf_mmse_ffheader,
 	    {   "Free format (not encoded) header", "mmse.ffheader",
 		FT_STRING, BASE_NONE, NULL, 0x00,
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index 473c8a1fb2..44f07523ff 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -1338,13 +1338,13 @@ proto_register_mp2t(void)
 			"Continuity Counter Drops", "mp2t.cc.drop",
 			FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL
 		} } ,
-/**
+#if 0
 		{ &hf_mp2t_analysis_flags, {
 			"MPEG2-TS Analysis Flags", "mp2t.analysis.flags",
 			FT_NONE, BASE_NONE, NULL, 0x0,
 			"This frame has some of the MPEG2 analysis flags set", HFILL
 		} } ,
-**/
+#endif
 		{ &hf_mp2t_analysis_skips, {
 			"TS Continuity Counter Skips", "mp2t.analysis.skips",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -1487,12 +1487,12 @@ proto_register_mp2t(void)
 			"Marker Bit", "mp2t.af.e.m_3",
 			FT_UINT16, BASE_DEC, NULL, 0x0001, NULL, HFILL
 		} } ,
-/**
+#if 0
 		{ &hf_mp2t_payload, {
 			"Payload", "mp2t.payload",
 			FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
 		} } ,
-**/
+#endif
 		{ &hf_mp2t_stuff_bytes, {
 			"Stuffing", "mp2t.stuff_bytes",
 			FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
diff --git a/epan/dissectors/packet-mpls-y1711.c b/epan/dissectors/packet-mpls-y1711.c
index 7f4fbabe04..aafec7b213 100644
--- a/epan/dissectors/packet-mpls-y1711.c
+++ b/epan/dissectors/packet-mpls-y1711.c
@@ -360,7 +360,7 @@ proto_register_mpls_y1711(void)
                 0x0, "Function Type codepoint", HFILL
             }
         },
-/**
+#if 0
         {
             &hf_mpls_y1711_ttsi,
             {
@@ -369,7 +369,7 @@ proto_register_mpls_y1711(void)
                 FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL
             }
         },
-**/
+#endif
         {
             &hf_mpls_y1711_frequency,
             {
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index fd6291fcea..0f15791ba5 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -2634,10 +2634,10 @@ proto_register_mq(void)
         { &hf_mq_id_heartbeatinterval,
           { "Heartbeat interval", "mq.id.hbint", FT_UINT32, BASE_DEC, NULL, 0x0, "ID Heartbeat interval", HFILL }},
 
-/**
+#if 0
         { &hf_mq_id_unknown6,
           { "Unknown6", "mq.id.unknown6", FT_UINT16, BASE_HEX, NULL, 0x0, "ID unknown6", HFILL }},
-**/
+#endif
 
         { &hf_mq_id_ief_ccsid,
           { "Invalid CCSID", "mq.id.ief.ccsid", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF_CCSID, "ID invalid CCSID", HFILL }},
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c
index 0350f6b1db..ec2eb6519c 100644
--- a/epan/dissectors/packet-ms-mms.c
+++ b/epan/dissectors/packet-ms-mms.c
@@ -1211,7 +1211,7 @@ void proto_register_msmms(void)
             }
         },
 
-/**
+#if 0
         {
             &hf_msmms_command_version,
             {
@@ -1224,7 +1224,7 @@ void proto_register_msmms(void)
                 NULL, HFILL
             }
         },
-**/
+#endif
         {
             &hf_msmms_command_signature,
             {
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c
index c7651631ef..cae913f0ca 100644
--- a/epan/dissectors/packet-msproxy.c
+++ b/epan/dissectors/packet-msproxy.c
@@ -1162,13 +1162,13 @@ proto_register_msproxy( void){
 			}
 		},
 
-/**
+#if 0
 		{ &hf_msproxy_srcport,
 			{ "Source Port", "msproxy.srcport", FT_UINT16,
 				BASE_DEC, NULL, 0x0, NULL, HFILL
 			}
 		},
-**/
+#endif
 		{ &hf_msproxy_dstport,
 			{ "Destination Port", "msproxy.dstport", FT_UINT16,
 				BASE_DEC, NULL, 0x0, NULL, HFILL
diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c
index 8a2d8cbd92..757f174952 100644
--- a/epan/dissectors/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
@@ -1425,24 +1425,24 @@ proto_register_mtp3mg(void)
 	    { "Affected Point Code", "mtp3mg.ansi_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
 	      NULL, HFILL }},
-/**
+#if 0
 	{ &hf_mtp3mg_upu_apc_member,
 	    { "Affected Point Code member", "mtp3mg.apc.member",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
 	      NULL, HFILL }},
-**/
-/**
+#endif
+#if 0
 	{ &hf_mtp3mg_upu_apc_cluster,
 	    { "Affected Point Code cluster", "mtp3mg.apc.cluster",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
 	      NULL, HFILL }},
-**/
-/**
+#endif
+#if 0
 	{ &hf_mtp3mg_upu_apc_network,
 	    { "Affected Point Code network", "mtp3mg.apc.network",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
 	      NULL, HFILL }},
-**/
+#endif
 	{ &hf_mtp3mg_upu_itu_apc,
 	    { "Affected Point Code", "mtp3mg.apc",
 	      FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c
index 392a61ab16..bb716ffdef 100644
--- a/epan/dissectors/packet-mux27010.c
+++ b/epan/dissectors/packet-mux27010.c
@@ -1275,11 +1275,11 @@ proto_register_mux27010 (void)
           { "C/R Address Flag", "mux27010.address.craddress",
             FT_BOOLEAN, 8, NULL, MUX27010_CR_ADDRESS_FLAG, NULL, HFILL }},
 
-/**
+#if 0
         { &hf_mux27010_addressdirection,
           { "Direction", "mux27010.address.direction",
             FT_UINT8, BASE_HEX, NULL, MUX27010_CR_ADDRESS_FLAG, NULL, HFILL }},
-**/
+#endif
 
         /*Control frame*/
 
@@ -1382,11 +1382,11 @@ proto_register_mux27010 (void)
           { "DLCI number (decimal)", "mux27010.controlchannel.value.detailedvaluemscdlci",
             FT_UINT8, BASE_DEC, NULL, MUX27010_VALUE_CONTROLCHANNEL_MSC_DCLI, NULL, HFILL }},
 
-/**
+#if 0
         { &hf_mux27010_controlchanneldetailedvaluemscv24,
           { "V.24 Signal", "mux27010.controlchannel.value.detailedvaluemscv24",
             FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-**/
+#endif
 
         { &hf_mux27010_controlchanneldetailedvaluemscv24fc,
           { "FC", "mux27010.controlchannel.value.detailedvaluemscv24.fc",