diff options
| author | Andreas Jaeger <aj@suse.de> | 2001-07-23 07:55:03 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2001-07-23 07:55:03 +0000 |
| commit | 0588dfe7f9e6611cc0e941a4e33d46a000980c33 (patch) | |
| tree | b138a49fdcef44ea47e612d3a7879ebcb012e68a /iconv | |
| parent | 42240ec16ec0f44f42ec39b7151ba2fa12c37f63 (diff) | |
| download | glibc-0588dfe7f9e6611cc0e941a4e33d46a000980c33.tar.gz glibc-0588dfe7f9e6611cc0e941a4e33d46a000980c33.tar.xz glibc-0588dfe7f9e6611cc0e941a4e33d46a000980c33.zip | |
* iconv/iconvconfig.c: Include <sys/cdefs.h> and use
__attribute_malloc__ for older GCC versions. * iconv/strtab.c: Likewise.
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/iconvconfig.c | 21 | ||||
| -rw-r--r-- | iconv/strtab.c | 3 |
2 files changed, 13 insertions, 11 deletions
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c index 3d986af392..a8523bf25c 100644 --- a/iconv/iconvconfig.c +++ b/iconv/iconvconfig.c @@ -4,19 +4,19 @@ Contributed by Ulrich Drepper <drepper@redhat.com>, 2000. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ #include <argp.h> #include <assert.h> @@ -33,6 +33,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <sys/cdefs.h> #include <sys/uio.h> #include "iconvconfig.h" @@ -215,8 +216,8 @@ static struct static const char gconv_module_ext[] = MODULE_EXT; -extern void *xmalloc (size_t n) __attribute__ ((__malloc__)); -extern void *xcalloc (size_t n, size_t m) __attribute__ ((__malloc__)); +extern void *xmalloc (size_t n) __attribute_malloc__; +extern void *xcalloc (size_t n, size_t m) __attribute_malloc__; extern void *xrealloc (void *p, size_t n); diff --git a/iconv/strtab.c b/iconv/strtab.c index be79dc29ed..49fb254454 100644 --- a/iconv/strtab.c +++ b/iconv/strtab.c @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <sys/cdefs.h> #include <sys/param.h> @@ -65,7 +66,7 @@ struct Strtab static size_t ps; -extern void *xmalloc (size_t n) __attribute__ ((__malloc__)); +extern void *xmalloc (size_t n) __attribute_malloc__; struct Strtab * |