summaryrefslogtreecommitdiff
path: root/epan/epan.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2012-12-18 23:36:45 +0000
committerEvan Huus <eapache@gmail.com>2012-12-18 23:36:45 +0000
commit561525cbb538b030d28aa4951cf77c9f3f286954 (patch)
treedb11c853df698f691bd2537fd68717ae8fa8f0ce /epan/epan.c
parent09221f45e4db2e2fb01fda57bc20e315a29c9838 (diff)
downloadwireshark-561525cbb538b030d28aa4951cf77c9f3f286954.tar.gz
Rename allocator_glib to allocator_simple, since the block allocator also
uses glib and 'simple' describes the intention far better. svn path=/trunk/; revision=46603
Diffstat (limited to 'epan/epan.c')
-rw-r--r--epan/epan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/epan.c b/epan/epan.c
index 86a65443f7..d9c19b30e8 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -51,7 +51,7 @@
#include "oids.h"
#include "emem.h"
#include "wmem/wmem.h"
-#include "wmem/wmem_allocator_glib.h"
+#include "wmem/wmem_allocator_simple.h"
#include "expert.h"
#ifdef HAVE_LUA
@@ -162,7 +162,7 @@ epan_dissect_init(epan_dissect_t *edt, const gboolean create_proto_tree, const g
{
g_assert(edt);
- edt->pi.pool = wmem_glib_allocator_new();
+ edt->pi.pool = wmem_simple_allocator_new();
if (create_proto_tree) {
edt->tree = proto_tree_create_root(&edt->pi);