@@ -40,14 +40,7 @@

 #define UNDECIDED_16_BE UTF16_BE

 #define UNDECIDED_16_LE UTF16_LE

 #define UNDECIDED_8 "ISO-8859-1"

-#define EBCDIC "EBCDIC-US"

-#define UNKNOWN "\0"

-#define OTHER   "OTHER"

-

-enum encoding_priority {NOPRIO,CONTENT_TYPE,BOM,NOBOM_AUTODETECT,XML_CHARSET,META, SWITCH_TO_BLOCKMODE};

-

-enum encodings {E_UCS4,E_UTF16,E_UCS4_1234,E_UCS4_4321,E_UCS4_2143,E_UCS4_3412,E_UTF16_BE,E_UTF16_LE,E_UTF8, E_UNKNOWN,E_OTHER, E_ICONV};

 #define MAX_ENTITY_SIZE 22

 struct entity_conv {