X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/207d0dbfbbfa7ad70b59ada3a741895842958885..7b34413e9942b5777aed4fd3dc9c261214981e74:/src/copysym.c?ds=sidebyside

diff --git a/src/copysym.c b/src/copysym.c
index 8ecace7..3d72d6a 100644
--- a/src/copysym.c
+++ b/src/copysym.c
@@ -17,11 +17,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include "xtra.h"
+
+#define ARRAYSIZE(x) (sizeof (x) / sizeof (x)[0])
 
 static int compar_5arr(const void *key, const void *elem_)
 {
-	const char (*elem)[5] = elem_;
+	const char (*elem)[5] = (void *)elem_;
 
 	return strncmp(key, *elem, sizeof *elem);
 }
@@ -130,7 +131,7 @@ const char *copyright_symbol(const char *charset)
 	if (!charset)
 		goto no_conv;
 
-	m1 = bsearch(charset, t1, XTRA_ARRAYSIZE(t1), sizeof *t1, compar_5arr);
+	m1 = bsearch(charset, t1, ARRAYSIZE(t1), sizeof *t1, compar_5arr);
 	if (!m1)
 		goto no_conv;
 	charset += 5;