summaryrefslogtreecommitdiff
path: root/asn1/h245
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2008-04-07 05:22:54 +0000
committerStephen Fisher <steve@stephen-fisher.com>2008-04-07 05:22:54 +0000
commit726a1caaf1c717a5784beb2fb5a05900552563f0 (patch)
tree3f861f04f60e8872bcf7f82f56de654af93a7590 /asn1/h245
parent545d54ae745aa147ffa2e883dd0b982b56f86761 (diff)
downloadwireshark-726a1caaf1c717a5784beb2fb5a05900552563f0.tar.gz
- Remove GLIB1 code
- Change ugly GLIB version checking statements to GLIB_CHECK_VERSION - Remove ws_strsplit files because we no longer need to borrow GLIB2's g_strsplit code for the no longer supported GLIB1 builds svn path=/trunk/; revision=24829
Diffstat (limited to 'asn1/h245')
-rw-r--r--asn1/h245/packet-h245-template.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index bbfe34138f..6dac48ad54 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -344,11 +344,7 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha
/* (S)RTP, (S)RTCP */
if (upcoming_channel->rfc2198 > 0) {
-#if GLIB_MAJOR_VERSION < 2
- rtp_dyn_payload = g_hash_table_new(g_int_hash, g_int_equal);
-#else
rtp_dyn_payload = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free);
-#endif
key = g_malloc(sizeof(gint));
*key = upcoming_channel->rfc2198;
g_hash_table_insert(rtp_dyn_payload, key, g_strdup("red"));