summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Blandy <jimb@red-bean.com>1999-09-10 15:42:04 +0000
committerJim Blandy <jimb@red-bean.com>1999-09-10 15:42:04 +0000
commite579aac1c557d7831e5b7545615ae904429e1149 (patch)
treef45f34f9cc7c7a841982ac936754ca2bfd42e9a7
parent3305ef30e31ce1f33b485a2e8ec86d723c9c6757 (diff)
downloadguile-e579aac1c557d7831e5b7545615ae904429e1149.tar.gz
* mb.h (scm_mb_put): Revert previous change; the argument to this
macro should be an scm_char_t, so the comparison is correct as it stands. * mbemacs.h (IS_ASCII_CHAR): Similar change --- cast to unsigned, not unsigned char.
-rw-r--r--libguile/mb.h4
-rw-r--r--libguile/mbemacs.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libguile/mb.h b/libguile/mb.h
index 73c9d00b7..d4a5fb13a 100644
--- a/libguile/mb.h
+++ b/libguile/mb.h
@@ -75,10 +75,10 @@ extern SCM scm_text_not_guile_char;
((unsigned char) *(p) < 128 ? *(p) : scm_mb_get_func (p))
extern scm_char_t scm_mb_get_func (const unsigned char *p);
-/* Store the encoding of the character C at P, and return the
+/* Store the encoding of the Guile character C at P, and return the
encoding's length in bytes. */
#define scm_mb_put(c, p) \
- ((unsigned char) (c) < 128 ? (*(p) = c, 1) : scm_mb_put_func ((c), (p)))
+ ((c) < 128 ? (*(p) = c, 1) : scm_mb_put_func ((c), (p)))
extern int scm_mb_put_func (scm_char_t c, unsigned char *p);
/* The length of the longest character encoding, in bytes. */
diff --git a/libguile/mbemacs.h b/libguile/mbemacs.h
index 22e67a437..72250cbbf 100644
--- a/libguile/mbemacs.h
+++ b/libguile/mbemacs.h
@@ -193,7 +193,7 @@
| ((pos1) << 7) \
| (pos2))
-#define IS_ASCII_CHAR(c) ((unsigned char) (c) < 0x80)
+#define IS_ASCII_CHAR(c) ((unsigned) (c) < 0x80)
#define FIRST_CHAR1O (BUILD_CHAR1 (0x81, 0x20))
#define LAST_CHAR1O (BUILD_CHAR1 (0x8f, 0x7F))