we’ll need to distinguish these for sarge/etch as well

[alioth/jupp.git] / charmap.h

diff --git a/charmap.h b/charmap.h
index 35f3336..e3a9598 100644 (file)
--- a/charmap.h
+++ b/charmap.h
@@ -1,4 +1,3 @@
-/* $MirOS: contrib/code/jupp/charmap.h,v 1.4 2010/01/03 18:22:04 tg Exp $ */
 /*
  *     Character sets
  *     Copyright
@@ -10,9 +9,9 @@
 #ifndef _Icharmap
 #define _Icharmap 1
 
-#include "config.h"
-#include "utf8.h"
-#include "types.h"
+#ifdef EXTERN
+__IDSTRING(rcsid_charmap_h, "$MirOS: contrib/code/jupp/charmap.h,v 1.9 2017/12/02 17:00:48 tg Exp $");
+#endif
 
 /* For sorted from_map entries */
 
@@ -53,7 +52,7 @@ struct charmap {
 
        struct pair from_map[256 + 2];  /* Convert from unicode to byte */
 
-       int from_size;                  /* No. paris in from_map */
+       int from_size;                  /* No. pairs in from_map */
 
        unsigned char print_map[32];    /* Bit map of printable characters */
        unsigned char alpha__map[32];   /* Bit map of alphabetic characters and _ */
@@ -76,7 +75,7 @@ int joe_isspace_eof PARAMS((struct charmap *map,int c));
 #define joe_toupper(map,c) ((map)->to_upper((map),(c)))
 #define joe_to_uni(map,c) ((map)->to_uni((map),(c)))
 #define joe_from_uni(map,c) ((map)->from_uni((map),(c)))
-unsigned char *lowerize PARAMS((unsigned char *s));
+unsigned char *joe_strtolower PARAMS((unsigned char *s));
 
 /* Find (load if necessary) a character set */
 struct charmap *find_charmap PARAMS((const unsigned char *name));
@@ -87,4 +86,6 @@ unsigned char **get_encodings PARAMS((void));
 int to_uni PARAMS((struct charmap *cset, int c));
 int from_uni PARAMS((struct charmap *cset, int c));
 
+#include "utf8.h"
+
 #endif