summaryrefslogtreecommitdiff
path: root/iconv/gconv.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-07 23:57:22 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-07 23:57:22 -0500
commita784e502472fb3a1afa4d01a47c66b52d23e00f6 (patch)
tree5ebaa084119dcffe41671a62e2e799b172c57d24 /iconv/gconv.h
parent33808bf1164be2e7c8535bdd5ac398c75c33ed49 (diff)
Remove pre-ISO C support
No more __const.
Diffstat (limited to 'iconv/gconv.h')
-rw-r--r--iconv/gconv.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/iconv/gconv.h b/iconv/gconv.h
index bc6d381aa0..24e2c0f3b7 100644
--- a/iconv/gconv.h
+++ b/iconv/gconv.h
@@ -70,7 +70,7 @@ struct __gconv_trans_data;
/* Type of a conversion function. */
typedef int (*__gconv_fct) (struct __gconv_step *, struct __gconv_step_data *,
- __const unsigned char **, __const unsigned char *,
+ const unsigned char **, const unsigned char *,
unsigned char **, size_t *, int, int);
/* Type of a specialized conversion function for a single byte to INTERNAL. */
@@ -84,18 +84,18 @@ typedef void (*__gconv_end_fct) (struct __gconv_step *);
/* Type of a transliteration/transscription function. */
typedef int (*__gconv_trans_fct) (struct __gconv_step *,
struct __gconv_step_data *, void *,
- __const unsigned char *,
- __const unsigned char **,
- __const unsigned char *, unsigned char **,
+ const unsigned char *,
+ const unsigned char **,
+ const unsigned char *, unsigned char **,
size_t *);
/* Function to call to provide transliteration module with context. */
-typedef int (*__gconv_trans_context_fct) (void *, __const unsigned char *,
- __const unsigned char *,
+typedef int (*__gconv_trans_context_fct) (void *, const unsigned char *,
+ const unsigned char *,
unsigned char *, unsigned char *);
/* Function to query module about supported encoded character sets. */
-typedef int (*__gconv_trans_query_fct) (__const char *, __const char ***,
+typedef int (*__gconv_trans_query_fct) (const char *, const char ***,
size_t *);
/* Constructor and destructor for local data for transliteration. */
@@ -117,7 +117,7 @@ struct __gconv_trans_data
struct __gconv_step
{
struct __gconv_loaded_object *__shlib_handle;
- __const char *__modname;
+ const char *__modname;
int __counter;