aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wmem
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2014-01-05 00:47:24 +0000
committerEvan Huus <eapache@gmail.com>2014-01-05 00:47:24 +0000
commit36e68f7b36d2dc41b48940fcfe89c0a876e84433 (patch)
treedcb71521f86b9ab123e453a2120e850a3acaec30 /epan/wmem
parent21cc2789053f4eeeec928813984cdba0e154d347 (diff)
From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9613
Don't use "rand" as a variable name, it shadows a global in recent MacOSX stdlib.h svn path=/trunk/; revision=54598
Diffstat (limited to 'epan/wmem')
-rw-r--r--epan/wmem/wmem_test.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/wmem/wmem_test.c b/epan/wmem/wmem_test.c
index 6e83e4b322..064b22ed51 100644
--- a/epan/wmem/wmem_test.c
+++ b/epan/wmem/wmem_test.c
@@ -787,9 +787,9 @@ wmem_test_tree(void)
tree = wmem_tree_new(allocator);
for (i=0; i<CONTAINER_ITERS; i++) {
- guint32 rand = g_test_rand_int();
- wmem_tree_insert32(tree, rand, GINT_TO_POINTER(i));
- g_assert(wmem_tree_lookup32(tree, rand) == GINT_TO_POINTER(i));
+ guint32 rand_int = g_test_rand_int();
+ wmem_tree_insert32(tree, rand_int, GINT_TO_POINTER(i));
+ g_assert(wmem_tree_lookup32(tree, rand_int) == GINT_TO_POINTER(i));
}
wmem_free_all(allocator);