summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-19 04:55:31 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-19 04:55:31 +0000
commit477aa8698f7963b0984c15016f62f99efe4bb0b5 (patch)
tree238a2903ead490f4427d3dd9266ee662d8281f0a
parent97d261ad227332e4f74bbcf283bf2654a32cabea (diff)
* iconv/gconv_builtin.c (builtin_map): Change type of size
information fields to int8_t.
-rw-r--r--ChangeLog3
-rw-r--r--iconv/gconv_builtin.c13
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4916a4e550..3c186d7953 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-12-18 Ulrich Drepper <drepper@redhat.com>
+ * iconv/gconv_builtin.c (builtin_map): Change type of size
+ information fields to int8_t.
+
* libio/iofwide.c (__libio_codecvt): Mark as const.
(__libio_translit): Likewise.
* libio/libioP.h (__libio_codecvt): Adjust declaraction.
diff --git a/iconv/gconv_builtin.c b/iconv/gconv_builtin.c
index bea8328ce8..d8beabd416 100644
--- a/iconv/gconv_builtin.c
+++ b/iconv/gconv_builtin.c
@@ -20,6 +20,7 @@
#include <endian.h>
#include <limits.h>
+#include <stdint.h>
#include <string.h>
#include <gconv_int.h>
@@ -27,18 +28,18 @@
#include <assert.h>
-static struct builtin_map
+static const struct builtin_map
{
const char *name;
__gconv_fct fct;
__gconv_btowc_fct btowc_fct;
- int min_needed_from;
- int max_needed_from;
- int min_needed_to;
- int max_needed_to;
+ int8_t min_needed_from;
+ int8_t max_needed_from;
+ int8_t min_needed_to;
+ int8_t max_needed_to;
-} map[] attribute_relro =
+} map[] =
{
#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, BtowcFct, \
MinF, MaxF, MinT, MaxT) \