From a784e502472fb3a1afa4d01a47c66b52d23e00f6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 7 Jan 2012 23:57:22 -0500 Subject: Remove pre-ISO C support No more __const. --- sysdeps/unix/sysv/linux/s390/s390-32/utmp-convert.h | 6 +++--- sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h | 17 +++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) (limited to 'sysdeps/unix/sysv/linux/s390') diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmp-convert.h b/sysdeps/unix/sysv/linux/s390/s390-32/utmp-convert.h index 4fb77faa9a..33de68356c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmp-convert.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmp-convert.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2012 Free Software Foundation, Inc. Contributed by Andreas Krebbel . This file is part of the GNU C Library. @@ -32,7 +32,7 @@ /* Convert the 64 bit struct utmp value in FROM to the 32 bit version returned in TO. */ static inline void -utmp_convert64to32 (__const struct utmp *from, struct utmp32 *to) +utmp_convert64to32 (const struct utmp *from, struct utmp32 *to) { #if _HAVE_UT_TYPE - 0 to->ut_type = from->ut_type; @@ -60,7 +60,7 @@ utmp_convert64to32 (__const struct utmp *from, struct utmp32 *to) /* Convert the 32 bit struct utmp value in FROM to the 64 bit version returned in TO. */ static inline void -utmp_convert32to64 (__const struct utmp32 *from, struct utmp *to) +utmp_convert32to64 (const struct utmp32 *from, struct utmp *to) { #if _HAVE_UT_TYPE - 0 to->ut_type = from->ut_type; diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h index dedc6c6be8..9042e0f554 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h @@ -1,5 +1,5 @@ /* The `struct utmp' type, describing entries in the utmp file. GNU version. - Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002, 2008, 2010 + Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002, 2008, 2010, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -51,14 +51,11 @@ struct utmpx32 /* The internal interface needed by the compat wrapper functions. */ extern struct utmpx *__getutxent (void); -extern struct utmpx *__getutxid (__const struct utmpx *__id); -extern struct utmpx *__getutxline (__const struct utmpx *__line); -extern struct utmpx *__pututxline (__const struct utmpx *__utmpx); -extern void __updwtmpx (__const char *__wtmpx_file, - __const struct utmpx *__utmpx); -extern void __getutmp (__const struct utmpx *__utmpx, - struct utmp *__utmp); -extern void __getutmpx (__const struct utmp *__utmp, - struct utmpx *__utmpx); +extern struct utmpx *__getutxid (const struct utmpx *__id); +extern struct utmpx *__getutxline (const struct utmpx *__line); +extern struct utmpx *__pututxline (const struct utmpx *__utmpx); +extern void __updwtmpx (const char *__wtmpx_file, const struct utmpx *__utmpx); +extern void __getutmp (const struct utmpx *__utmpx, struct utmp *__utmp); +extern void __getutmpx (const struct utmp *__utmp, struct utmpx *__utmpx); #endif /* utmpx32.h */ -- cgit 1.4.1