diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-10-26 12:43:40 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-10-26 12:43:40 +0000 |
| commit | 758ee054ab535a22e88eca8f6c209154b582937d (patch) | |
| tree | 8f8e3fb94f8f960fbad2724340ecd5c31310e4b6 /epan/dissectors/packet-zbee-nwk.c | |
| parent | fbb65b97b6cb8b85637f5723dbb2007384a14741 (diff) | |
Follow up on:
You may not use g_int64_hash() or g_int64_equal(), as they are not present in the minimum version of GLib that we support. Create a ieee802154_long_addr structure for long addresses, create hash routines for those addresses, and use them.
Export and use those routines.
svn path=/trunk/; revision=34653
Diffstat (limited to 'epan/dissectors/packet-zbee-nwk.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-nwk.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 4ce8b60c45..1b64099e04 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -1904,8 +1904,6 @@ proto_init_zbee_nwk(void) /* (Re)create the hash tables. */ zbee_nwk_addr.short_table = g_hash_table_new(ieee802154_short_addr_hash, ieee802154_short_addr_equal); -#if GLIB_CHECK_VERSION(2,22,0) - zbee_nwk_addr.long_table = g_hash_table_new(g_int64_hash, g_int64_equal); -#endif + zbee_nwk_addr.long_table = g_hash_table_new(ieee802154_long_addr_hash, ieee802154_long_addr_equal); zbee_table_nwk_keyring = g_hash_table_new_full(g_int_hash, g_int_equal, NULL, free_keyring_val); } /* proto_init_zbee_nwk */ |