qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* iconv/iconvconfig.c: Include <sys/cdefs.h> and use 

__attribute_malloc__ for older GCC versions. 
* iconv/strtab.c: Likewise.
This commit is contained in:
Andreas Jaeger 2001-07-23 07:55:03 +00:00
parent 42240ec16e
commit 0588dfe7f9
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
iconv/iconvconfig.c
View File

@ -4,19 +4,19 @@
Contributed by Ulrich Drepper <drepper@redhat.com>, 2000. Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
The GNU C Library is free software; you can redistribute it and/or 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 modify it under the terms of the GNU Lesser General Public
published by the Free Software Foundation; either version 2 of the License as published by the Free Software Foundation; either
License, or (at your option) any later version. 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, The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 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 You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; see the file COPYING.LIB. If not, License along with the GNU C Library; if not, write to the Free
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
Boston, MA 02111-1307, USA. */ 02111-1307 USA. */
#include <argp.h> #include <argp.h>
#include <assert.h> #include <assert.h>
@ -33,6 +33,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/cdefs.h>
#include <sys/uio.h> #include <sys/uio.h>
#include "iconvconfig.h" #include "iconvconfig.h"
@ -215,8 +216,8 @@ static struct
static const char gconv_module_ext[] = MODULE_EXT; static const char gconv_module_ext[] = MODULE_EXT;
extern void *xmalloc (size_t n) __attribute__ ((__malloc__)); extern void *xmalloc (size_t n) __attribute_malloc__;
extern void *xcalloc (size_t n, size_t m) __attribute__ ((__malloc__)); extern void *xcalloc (size_t n, size_t m) __attribute_malloc__;
extern void *xrealloc (void *p, size_t n); extern void *xrealloc (void *p, size_t n);

3
iconv/strtab.c
View File

@ -26,6 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/cdefs.h>
#include <sys/param.h> #include <sys/param.h>
@ -65,7 +66,7 @@ struct Strtab
static size_t ps; static size_t ps;
extern void *xmalloc (size_t n) __attribute__ ((__malloc__)); extern void *xmalloc (size_t n) __attribute_malloc__;
struct Strtab * struct Strtab *