Index: uniq_name/Makefile
===================================================================
--- uniq_name/Makefile	(revision 33434)
+++ uniq_name/Makefile	(revision 33435)
@@ -8,7 +8,7 @@
 SRC=$(ROOT)/src
 SRC_3RD=$(ROOT)/src_3rd
 CFLAGS = $(PCB_RND_C89FLAGS) -I$(UNM) -I$(LHT) -I$(SRC) -I$(ROOT)
-LDLIBS = -lm
+LDLIBS = -lm -lgenht
 LIB_OBJS=$(SRC_3RD)/librnd-local/src/librnd-hid.a $(SRC_3RD)/librnd-local/src/librnd-3rd.a
 
 
Index: uniq_name/tester.c
===================================================================
--- uniq_name/tester.c	(revision 33434)
+++ uniq_name/tester.c	(revision 33435)
@@ -4,13 +4,14 @@
 int main()
 {
 	unm_t group1;
+	int values[8];
 
 	/* Initialize the group with defaults */
 	unm_init(&group1);
 
-	printf("'%s'\n", unm_name(&group1, "foo", (void *)0x01));
-	printf("'%s'\n", unm_name(&group1, "bar", (void *)0x42));
-	printf("'%s'\n", unm_name(&group1, "bar", (void *)0x66));
+	printf("'%s'\n", unm_name(&group1, "foo", &values[1]));
+	printf("'%s'\n", unm_name(&group1, "bar", &values[2]));
+	printf("'%s'\n", unm_name(&group1, "bar", &values[3]));
 	printf("'%s'\n", unm_name(&group1, "baz", NULL));
 
 	/* test forced collision */
@@ -54,7 +55,7 @@
 			if (e->value == NULL)
 				printf("(nil)'\n");
 			else
-				printf("%p'\n", e->value);
+				printf("#%d'\n", ((int *)e->value) - values);
 		}
 	}
 
Index: uniq_name/tester.ref
===================================================================
--- uniq_name/tester.ref	(revision 33434)
+++ uniq_name/tester.ref	(revision 33435)
@@ -18,9 +18,9 @@
 name='forced_dup2' user_data='(nil)'
 name='forced_dup3' user_data='(nil)'
 name='forced_dup4' user_data='(nil)'
-name='foo' user_data='0x1'
+name='foo' user_data='#1'
 name='baz' user_data='(nil)'
-name='bar_dup0' user_data='0x66'
+name='bar_dup0' user_data='#3'
 name='unnamed_dup6' user_data='(nil)'
 name='forced' user_data='(nil)'
 name='unnamed_dup7' user_data='(nil)'
@@ -28,5 +28,5 @@
 name='anonymous' user_data='(nil)'
 name='anonymous::0' user_data='(nil)'
 name='anonymous::1' user_data='(nil)'
-name='bar' user_data='0x42'
+name='bar' user_data='#2'
 name='foo_dup5' user_data='(nil)'