diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2008-04-13 16:21:08 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2008-04-13 16:21:08 +0000 |
| commit | 668e79995aff3bb6d2172fbf5890d028da270b60 (patch) | |
| tree | 3c0ea4e2c5a19c0665ec901abc635ebeadbf22f5 | |
| parent | 85536e668e07a57e60e4c0296f702131e5ae07f9 (diff) | |
Removed #defined preference grouping
svn path=/trunk/; revision=24987
| -rw-r--r-- | asn1/dsp/packet-dsp-template.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-dsp.c | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c index 9283e7e406..e801443dc5 100644 --- a/asn1/dsp/packet-dsp-template.c +++ b/asn1/dsp/packet-dsp-template.c @@ -303,11 +303,7 @@ void proto_register_dsp(void) { /* Register our configuration options for DSP, particularly our port */ -#ifdef PREFERENCE_GROUPING dsp_module = prefs_register_protocol_subtree("OSI/X.500", proto_dsp, prefs_register_dsp); -#else - dsp_module = prefs_register_protocol(proto_dsp, prefs_register_dsp); -#endif prefs_register_uint_preference(dsp_module, "tcp.port", "DSP TCP Port", "Set the port for DSP operations (if other" diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index d74ab54b16..6a7869a4db 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -339,7 +339,7 @@ dissect_dsp_T_nameResolutionPhase(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_dsp_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; } @@ -2564,11 +2564,7 @@ void proto_register_dsp(void) { /* Register our configuration options for DSP, particularly our port */ -#ifdef PREFERENCE_GROUPING dsp_module = prefs_register_protocol_subtree("OSI/X.500", proto_dsp, prefs_register_dsp); -#else - dsp_module = prefs_register_protocol(proto_dsp, prefs_register_dsp); -#endif prefs_register_uint_preference(dsp_module, "tcp.port", "DSP TCP Port", "Set the port for DSP operations (if other" @@ -2593,7 +2589,7 @@ void proto_reg_handoff_dsp(void) { /*--- End of included file: packet-dsp-dis-tab.c ---*/ -#line 326 "packet-dsp-template.c" +#line 322 "packet-dsp-template.c" /* APPLICATION CONTEXT */ |