Remove #defined preference grouping

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24985 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c
index 3dac6aef1bd5036e0bbe21c9d862019f9f820fc0..cb59e31fdd7c10c52285a37449ee117e89d81e3f 100644 (file)
--- a/asn1/disp/packet-disp-template.c
+++ b/asn1/disp/packet-disp-template.c
@@ -225,11 +225,7 @@ void proto_register_disp(void) {
 
   /* Register our configuration options for DISP, particularly our port */
 
-#ifdef PREFERENCE_GROUPING
   disp_module = prefs_register_protocol_subtree("OSI/X.500", proto_disp, prefs_register_disp);
-#else
-  disp_module = prefs_register_protocol(proto_disp, prefs_register_disp);
-#endif
 
   prefs_register_uint_preference(disp_module, "tcp.port", "DISP TCP Port",
                                 "Set the port for DISP operations (if other"

diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index 83a9c8b81b60dfb2a5503ac07f1275d7c9419038..be7b969e6f03ad81796d387705121b8f6ca0f142 100644 (file)
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -546,7 +546,7 @@ dissect_disp_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 static int
 dissect_disp_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -1428,7 +1428,7 @@ dissect_disp_ShadowProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
   guint32 problem;
 
     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  &problem);
+                                                &problem);
 
 
   if (check_col(actx->pinfo->cinfo, COL_INFO)) {
@@ -2158,11 +2158,7 @@ void proto_register_disp(void) {
 
   /* Register our configuration options for DISP, particularly our port */
 
-#ifdef PREFERENCE_GROUPING
   disp_module = prefs_register_protocol_subtree("OSI/X.500", proto_disp, prefs_register_disp);
-#else
-  disp_module = prefs_register_protocol(proto_disp, prefs_register_disp);
-#endif
 
   prefs_register_uint_preference(disp_module, "tcp.port", "DISP TCP Port",
                                 "Set the port for DISP operations (if other"
@@ -2187,7 +2183,7 @@ void proto_reg_handoff_disp(void) {
 
 
 /*--- End of included file: packet-disp-dis-tab.c ---*/
-#line 247 "packet-disp-template.c"
+#line 243 "packet-disp-template.c"
 
   /* APPLICATION CONTEXT */