Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove pre-ISO C support
No more __const.
  • Loading branch information
Ulrich Drepper committed Jan 8, 2012
1 parent 33808bf commit a784e50
Show file tree
Hide file tree
Showing 209 changed files with 2,420 additions and 2,244 deletions.
202 changes: 202 additions & 0 deletions ChangeLog
@@ -1,5 +1,207 @@
2012-01-07 Ulrich Drepper <drepper@gmail.com>

[BZ #13553]
* misc/sys/cdefs.h: Remove __const, __signed, and __volatile definition
for non-gcc.
* argp/argp-fmtstream.h: Use const instead __const.
* argp/argp.h: Likewise.
* assert/assert.h: Likewise.
* bits/fenv.h: Likewise.
* bits/sched.h: Likewise.
* bits/sigset.h: Likewise.
* bits/sigthread.h: Likewise.
* catgets/nl_types.h: Likewise.
* conform/data/pthread.h-data: Likewise.
* crypt/crypt-private.h: Likewise.
* crypt/crypt.h: Likewise.
* crypt/crypt_util.c: Likewise.
* ctype/ctype.h: Likewise.
* debug/execinfo.h: Likewise.
* debug/mbsnrtowcs_chk.c: Likewise.
* debug/mbsrtowcs_chk.c: Likewise.
* debug/wcsnrtombs_chk.c: Likewise.
* debug/wcsrtombs_chk.c: Likewise.
* debug/wcstombs_chk.c: Likewise.
* dirent/dirent.h: Likewise.
* dlfcn/dlfcn.h: Likewise.
* elf/neededtest4.c: Likewise.
* grp/grp.h: Likewise.
* gshadow/gshadow.h: Likewise.
* iconv/gconv.h: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_simple.c: Likewise.
* iconv/iconv.h: Likewise.
* iconv/loop.c: Likewise.
* iconv/skeleton.c: Likewise.
* include/aio.h: Likewise.
* include/aliases.h: Likewise.
* include/argz.h: Likewise.
* include/arpa/inet.h: Likewise.
* include/assert.h: Likewise.
* include/dirent.h: Likewise.
* include/dlfcn.h: Likewise.
* include/execinfo.h: Likewise.
* include/fcntl.h: Likewise.
* include/fenv.h: Likewise.
* include/glob.h: Likewise.
* include/grp.h: Likewise.
* include/libintl.h: Likewise.
* include/mntent.h: Likewise.
* include/netdb.h: Likewise.
* include/pwd.h: Likewise.
* include/rpc/netdb.h: Likewise.
* include/sched.h: Likewise.
* include/search.h: Likewise.
* include/shadow.h: Likewise.
* include/signal.h: Likewise.
* include/stdio.h: Likewise.
* include/stdlib.h: Likewise.
* include/string.h: Likewise.
* include/sys/socket.h: Likewise.
* include/sys/stat.h: Likewise.
* include/sys/statfs.h: Likewise.
* include/sys/statvfs.h: Likewise.
* include/sys/syslog.h: Likewise.
* include/sys/time.h: Likewise.
* include/sys/uio.h: Likewise.
* include/time.h: Likewise.
* include/unistd.h: Likewise.
* include/utmp.h: Likewise.
* include/wchar.h: Likewise.
* include/wctype.h: Likewise.
* inet/aliases.h: Likewise.
* inet/arpa/inet.h: Likewise.
* inet/netinet/ether.h: Likewise.
* inet/netinet/in.h: Likewise.
* intl/libintl.h: Likewise.
* io/bits/fcntl2.h: Likewise.
* io/fcntl.h: Likewise.
* io/ftw.h: Likewise.
* io/sys/poll.h: Likewise.
* io/sys/stat.h: Likewise.
* io/sys/statfs.h: Likewise.
* io/sys/statvfs.h: Likewise.
* io/utime.h: Likewise.
* libio/bits/stdio.h: Likewise.
* libio/bits/stdio2.h: Likewise.
* libio/libio.h: Likewise.
* libio/libioP.h: Likewise.
* libio/stdio.h: Likewise.
* locale/lc-ctype.c: Likewise.
* locale/locale.h: Likewise.
* login/utmp.h: Likewise.
* malloc/arena.c: Likewise.
* malloc/malloc.c: Likewise.
* malloc/malloc.h: Likewise.
* malloc/mcheck.c: Likewise.
* malloc/mtrace.c: Likewise.
* math/bits/mathcalls.h: Likewise.
* math/fenv.h: Likewise.
* math/math_private.h: Likewise.
* misc/bits/error.h: Likewise.
* misc/bits/syslog.h: Likewise.
* misc/err.h: Likewise.
* misc/error.h: Likewise.
* misc/fstab.h: Likewise.
* misc/mntent.h: Likewise.
* misc/regexp.h: Likewise.
* misc/search.h: Likewise.
* misc/sgtty.h: Likewise.
* misc/sys/mman.h: Likewise.
* misc/sys/syslog.h: Likewise.
* misc/sys/uio.h: Likewise.
* misc/sys/xattr.h: Likewise.
* misc/ttyent.h: Likewise.
* nis/rpcsvc/ypclnt.h: Likewise.
* nss/nss.h: Likewise.
* posix/bits/unistd.h: Likewise.
* posix/fnmatch.h: Likewise.
* posix/glob.h: Likewise.
* posix/sched.h: Likewise.
* posix/spawn.h: Likewise.
* posix/sys/wait.h: Likewise.
* posix/unistd.h: Likewise.
* posix/wordexp.h: Likewise.
* pwd/pwd.h: Likewise.
* resolv/netdb.h: Likewise.
* resource/sys/resource.h: Likewise.
* rt/aio.h: Likewise.
* rt/bits/mqueue2.h: Likewise.
* rt/mqueue.h: Likewise.
* shadow/shadow.h: Likewise.
* signal/signal.h: Likewise.
* socket/send.c: Likewise.
* socket/sendto.c: Likewise.
* socket/sys/socket.h: Likewise.
* stdio-common/printf.h: Likewise.
* stdlib/bits/stdlib.h: Likewise.
* stdlib/fmtmsg.h: Likewise.
* stdlib/monetary.h: Likewise.
* stdlib/stdlib.h: Likewise.
* stdlib/ucontext.h: Likewise.
* streams/stropts.h: Likewise.
* string/argz.h: Likewise.
* string/bits/string2.h: Likewise.
* string/string.h: Likewise.
* string/strings.h: Likewise.
* sunrpc/rpc/auth.h: Likewise.
* sunrpc/rpc/auth_des.h: Likewise.
* sunrpc/rpc/clnt.h: Likewise.
* sunrpc/rpc/netdb.h: Likewise.
* sunrpc/rpc/pmap_clnt.h: Likewise.
* sunrpc/rpc/xdr.h: Likewise.
* sysdeps/generic/inttypes.h: Likewise.
* sysdeps/generic/net/if.h: Likewise.
* sysdeps/generic/sys/swap.h: Likewise.
* sysdeps/gnu/net/if.h: Likewise.
* sysdeps/gnu/utmpx.h: Likewise.
* sysdeps/i386/fpu/bits/fenv.h: Likewise.
* sysdeps/i386/i486/bits/string.h: Likewise.
* sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c: Likewise.
* sysdeps/s390/bits/string.h: Likewise.
* sysdeps/s390/fpu/bits/fenv.h: Likewise.
* sysdeps/sparc/fpu/bits/fenv.h: Likewise.
* sysdeps/sparc/fpu/bits/mathinline.h: Likewise.
* sysdeps/unix/sysv/linux/bits/resource.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sched.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigset.h: Likewise.
* sysdeps/unix/sysv/linux/bits/socket.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sys_errlist.h: Likewise.
* sysdeps/unix/sysv/linux/bits/uio.h: Likewise.
* sysdeps/unix/sysv/linux/i386/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/i386/olddirent.h: Likewise.
* sysdeps/unix/sysv/linux/preadv.c: Likewise.
* sysdeps/unix/sysv/linux/prlimit.c: Likewise.
* sysdeps/unix/sysv/linux/pwritev.c: Likewise.
* sysdeps/unix/sysv/linux/readv.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/utmp-convert.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/socket.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sys/epoll.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sys/timerfd.h: Likewise.
* sysdeps/unix/sysv/linux/sys/acct.h: Likewise.
* sysdeps/unix/sysv/linux/sys/epoll.h: Likewise.
* sysdeps/unix/sysv/linux/sys/mount.h: Likewise.
* sysdeps/unix/sysv/linux/sys/swap.h: Likewise.
* sysdeps/unix/sysv/linux/sys/timerfd.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sys/epoll.h: Likewise.
* sysdeps/x86_64/fpu/bits/fenv.h: Likewise.
* sysdeps/x86_64/strcasecmp_l-nonascii.c: Likewise.
* sysdeps/x86_64/strncase_l-nonascii.c: Likewise.
* sysvipc/sys/ipc.h: Likewise.
* sysvipc/sys/msg.h: Likewise.
* sysvipc/sys/sem.h: Likewise.
* sysvipc/sys/shm.h: Likewise.
* termios/termios.h: Likewise.
* time/sys/time.h: Likewise.
* time/time.h: Likewise.
* wcsmbs/bits/wchar2.h: Likewise.
* wcsmbs/uchar.h: Likewise.
* wcsmbs/wchar.h: Likewise.
* wctype/wctype.h: Likewise.

[BZ #13551]
* Makeconfig: Remove all but ELF support including AIX support.
* Makerules: Likewise.
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Expand Up @@ -10,7 +10,7 @@ Version 2.16
* The following bugs are resolved with this release:

13526, 13527, 13528, 13529, 13531, 13532, 13533, 13547, 13551, 13552,
13555, 13559
13553, 13555, 13559

* ISO C11 support:

Expand Down
22 changes: 9 additions & 13 deletions argp/argp-fmtstream.h
@@ -1,5 +1,5 @@
/* Word-wrapping and line-truncating streams.
Copyright (C) 1997, 2011 Free Software Foundation, Inc.
Copyright (C) 1997, 2011, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
Expand Down Expand Up @@ -90,9 +90,6 @@ typedef FILE *argp_fmtstream_t;
#else /* !ARGP_FMTSTREAM_USE_LINEWRAP */
/* Guess we have to define our own version. */

#ifndef __const
#define __const const
#endif

struct argp_fmtstream
{
Expand Down Expand Up @@ -133,22 +130,22 @@ extern void __argp_fmtstream_free (argp_fmtstream_t __fs);
extern void argp_fmtstream_free (argp_fmtstream_t __fs);

extern ssize_t __argp_fmtstream_printf (argp_fmtstream_t __fs,
__const char *__fmt, ...)
const char *__fmt, ...)
__attribute__ ((__format__ (printf, 2, 3)));
extern ssize_t argp_fmtstream_printf (argp_fmtstream_t __fs,
__const char *__fmt, ...)
const char *__fmt, ...)
__attribute__ ((__format__ (printf, 2, 3)));

extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);

extern int __argp_fmtstream_puts (argp_fmtstream_t __fs, __const char *__str);
extern int argp_fmtstream_puts (argp_fmtstream_t __fs, __const char *__str);
extern int __argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
extern int argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);

extern size_t __argp_fmtstream_write (argp_fmtstream_t __fs,
__const char *__str, size_t __len);
const char *__str, size_t __len);
extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
__const char *__str, size_t __len);
const char *__str, size_t __len);

/* Access macros for various bits of state. */
#define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
Expand Down Expand Up @@ -206,8 +203,7 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
#endif

ARGP_FS_EI size_t
__argp_fmtstream_write (argp_fmtstream_t __fs,
__const char *__str, size_t __len)
__argp_fmtstream_write (argp_fmtstream_t __fs, const char *__str, size_t __len)
{
if (__fs->p + __len <= __fs->end || __argp_fmtstream_ensure (__fs, __len))
{
Expand All @@ -220,7 +216,7 @@ __argp_fmtstream_write (argp_fmtstream_t __fs,
}

ARGP_FS_EI int
__argp_fmtstream_puts (argp_fmtstream_t __fs, __const char *__str)
__argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str)
{
size_t __len = strlen (__str);
if (__len)
Expand Down

0 comments on commit a784e50

Please sign in to comment.