/* Structure to store UNICODE -> target charset mappings */
/* array of 256 pointers (which may be null) to arrays of 256 short ints
which contain 8-bit character codes or -1 if no matching char */
-typedef short int ** CHARSET;
+typedef int16_t ** CHARSET;
/* structure to store multicharacter substitution mapping */
/* Array of 256 pointers to arrays of 256 pointers to string */
/* configuration variables defined in catdoc.c */
typedef char *** SUBSTMAP;
-extern short int *source_charset;
+extern uint16_t *source_charset;
extern char bad_char[]; /* defines one-symbol string to replace unknown unicode chars */
extern char *source_csname;
extern char *dest_csname;
extern int get_word8_char (FILE *f,long *offset,long fileend);
extern const char *charset_from_codepage(unsigned int codepage);
-extern short int *read_charset(const char *filename);
+extern uint16_t *read_charset(const char *filename);
extern CHARSET make_reverse_map (short int *charset);
-extern int to_unicode (short int *charset, int c) ;
+extern int to_unicode (uint16_t *charset, int c) ;
extern int from_unicode (CHARSET charset, int u) ;