diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-10-09 21:56:43 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-10-09 21:56:43 +0000 |
| commit | c1422e5b7cdb4400f934c91bcefa3a1a96d789fb (patch) | |
| tree | 7f8981b86c4ce4b5bb899f690eeb03d6645826a5 /iconv | |
| parent | a4a1492eb94de4f5c5ec84a5898e994fca5f317b (diff) | |
| download | glibc-c1422e5b7cdb4400f934c91bcefa3a1a96d789fb.zip glibc-c1422e5b7cdb4400f934c91bcefa3a1a96d789fb.tar.gz glibc-c1422e5b7cdb4400f934c91bcefa3a1a96d789fb.tar.bz2 | |
Update.
Patch by khendricks@ivey.uwo.ca [libc/1382].
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv.h | 11 | ||||
| -rw-r--r-- | iconv/iconv.h | 17 |
2 files changed, 13 insertions, 15 deletions
diff --git a/iconv/gconv.h b/iconv/gconv.h index f4a66c6..4d7022f 100644 --- a/iconv/gconv.h +++ b/iconv/gconv.h @@ -57,14 +57,13 @@ struct __gconv_loaded_object; /* Type of a conversion function. */ -typedef int (*__gconv_fct) __PMT ((struct __gconv_step *, - struct __gconv_step_data *, - __const unsigned char **, - __const unsigned char *, size_t *, int)); +typedef int (*__gconv_fct) (struct __gconv_step *, struct __gconv_step_data *, + __const unsigned char **, __const unsigned char *, + size_t *, int); /* Constructor and destructor for local data for conversion step. */ -typedef int (*__gconv_init_fct) __PMT ((struct __gconv_step *)); -typedef void (*__gconv_end_fct) __PMT ((struct __gconv_step *)); +typedef int (*__gconv_init_fct) (struct __gconv_step *); +typedef void (*__gconv_end_fct) (struct __gconv_step *); /* Description of a conversion step. */ diff --git a/iconv/iconv.h b/iconv/iconv.h index dac885b..217156c 100644 --- a/iconv/iconv.h +++ b/iconv/iconv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -32,20 +32,19 @@ typedef void *iconv_t; /* Allocate descriptor for code conversion from codeset FROMCODE to codeset TOCODE. */ -extern iconv_t iconv_open __P ((__const char *__tocode, - __const char *__fromcode)); +extern iconv_t iconv_open (__const char *__tocode, __const char *__fromcode) + __THROW; /* Convert at most *INBYTESLEFT bytes from *INBUF according to the code conversion algorithm specified by CD and place up to *OUTBYTESLEFT bytes in buffer at *OUTBUF. */ -extern size_t iconv __P ((iconv_t cd, - __const char **__restrict __inbuf, - size_t *__restrict __inbytesleft, - char **__restrict __outbuf, - size_t *__restrict __outbytesleft)); +extern size_t iconv (iconv_t cd, __const char **__restrict __inbuf, + size_t *__restrict __inbytesleft, + char **__restrict __outbuf, + size_t *__restrict __outbytesleft); /* Free resources allocated for descriptor CD for code conversion. */ -extern int iconv_close __P ((iconv_t __cd)); +extern int iconv_close (iconv_t __cd) __THROW; __END_DECLS |