@@ -40,11 +40,11 @@
 };
 const size_t of_codepage_850_table_offset =
     256 - (sizeof(of_codepage_850_table) / sizeof(*of_codepage_850_table));
 
 
-static const char page0[] = {
+static const unsigned char page0[] = {
 	0xFF, 0xAD, 0xBD, 0x9C, 0xCF, 0xBE, 0xDD, 0xF5,
 	0xF9, 0xB8, 0xA6, 0xAE, 0xAA, 0xF0, 0xA9, 0xEE,
 	0xF8, 0xF1, 0xFD, 0xFC, 0xEF, 0xE6, 0xF4, 0xFA,
 	0xF7, 0xFB, 0xA7, 0xAF, 0xAC, 0xAB, 0xF3, 0xA8,
 	0xB7, 0xB5, 0xB6, 0xC7, 0x8E, 0x8F, 0x92, 0x80,
@@ -55,13 +55,12 @@
 	0x8A, 0x82, 0x88, 0x89, 0x8D, 0xA1, 0x8C, 0x8B,
 	0xD0, 0xA4, 0x95, 0xA2, 0x93, 0xE4, 0x94, 0xF6,
 	0x9B, 0x97, 0xA3, 0x96, 0x81, 0xEC, 0xE7, 0x98
 };
 static const uint8_t page0Start = 0xA0;
-static const uint16_t page0Size = sizeof(page0) / sizeof(*page0);
 
-static const char page1[] = {
+static const unsigned char page1[] = {
 	0xD5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -73,19 +72,17 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x9F
 };
 static const uint8_t page1Start = 0x31;
-static const uint16_t page1Size = sizeof(page1) / sizeof(*page1);
 
-static const char page20[] = {
+static const unsigned char page20[] = {
 	0xF2
 };
 static const uint8_t page20Start = 0x17;
-static const uint16_t page20Size = sizeof(page20) / sizeof(*page20);
 
-static const char page25[] = {
+static const unsigned char page25[] = {
 	0xC4, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0xDA, 0x00, 0x00, 0x00,
 	0xBF, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00,
 	0xD9, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00,
@@ -105,11 +102,10 @@
 	0x00, 0xB0, 0xB1, 0xB2, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0xFE
 };
 static const uint8_t page25Start = 0x00;
-static const uint16_t page25Size = sizeof(page25) / sizeof(*page25);
 
 bool
 of_unicode_to_codepage_850(const of_unichar_t *input, unsigned char *output,
     size_t length, bool lossy)
 {