From: Carlos O'Donell <carlos@codesourcery.com>
Date: Mon, 9 Jan 2012 04:33:42 +0000 (-0500)
Subject: HPPA: Use const instead of __const
X-Git-Tag: glibc-2.16-ports-before-merge~307
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f4e78942c441cd249533dcffb3cd5ed1de33424;p=thirdparty%2Fglibc.git

HPPA: Use const instead of __const

Adjust sys/epoll.h and sys/timerfd.h to use const
instead of __const.
---

diff --git a/ChangeLog.hppa b/ChangeLog.hppa
index be3a951a857..28b9f21996e 100644
--- a/ChangeLog.hppa
+++ b/ChangeLog.hppa
@@ -1,3 +1,8 @@
+2012-01-08  Carlos O'Donell  <carlos@systemhalted.org>
+
+	* sysdeps/unix/sysv/linux/hppa/sys/epoll.h: Use const instead of __const.
+	* sysdeps/unix/sysv/linux/hppa/sys/timerfd.h: Likewise.
+
 2011-10-21  Carlos O'Donell  <carlos@systemhalted.org>
 
 	* sysdeps/unix/sysv/linux/hppa/sys/procfs.h: Update copyright year.
diff --git a/sysdeps/unix/sysv/linux/hppa/sys/epoll.h b/sysdeps/unix/sysv/linux/hppa/sys/epoll.h
index 1931cc687a7..b11a34d459f 100644
--- a/sysdeps/unix/sysv/linux/hppa/sys/epoll.h
+++ b/sysdeps/unix/sysv/linux/hppa/sys/epoll.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2009, 2012 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
@@ -137,7 +137,7 @@ extern int epoll_wait (int __epfd, struct epoll_event *__events,
    __THROW.  */
 extern int epoll_pwait (int __epfd, struct epoll_event *__events,
 			int __maxevents, int __timeout,
-			__const __sigset_t *__ss);
+			const __sigset_t *__ss);
 
 __END_DECLS
 
diff --git a/sysdeps/unix/sysv/linux/hppa/sys/timerfd.h b/sysdeps/unix/sysv/linux/hppa/sys/timerfd.h
index 78cdfc4788d..ca696c215a7 100644
--- a/sysdeps/unix/sysv/linux/hppa/sys/timerfd.h
+++ b/sysdeps/unix/sysv/linux/hppa/sys/timerfd.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2008, 2012 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
@@ -49,7 +49,7 @@ extern int timerfd_create (clockid_t __clock_id, int __flags) __THROW;
    FLAGS has the TFD_TIMER_ABSTIME flag set the timeout value is
    absolute.  Optionally return the old expiration time in OTMR.  */
 extern int timerfd_settime (int __ufd, int __flags,
-			    __const struct itimerspec *__utmr,
+			    const struct itimerspec *__utmr,
 			    struct itimerspec *__otmr) __THROW;
 
 /* Return the next expiration time of UFD.  */