#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);
}
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;