From 21e41c58872fec4ea9d7b21807bcc242337b1e2c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 7 Sep 2000 18:34:14 +0000 Subject: Update. 2000-09-07 Ulrich Drepper * assert/__assert.c: Undefine NDEBUG before include . * sysdeps/unix/sysv/linux/msgsnd.c (msgsnd): Add cast to avoid warning. * sysdeps/unix/sysv/linux/shmat.c (shmat): Likewise. --- ChangeLog | 7 +++++++ assert/__assert.c | 2 ++ sysdeps/unix/sysv/linux/msgsnd.c | 2 +- sysdeps/unix/sysv/linux/shmat.c | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9baa5b7767..356e51fb60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-09-07 Ulrich Drepper + + * assert/__assert.c: Undefine NDEBUG before include . + + * sysdeps/unix/sysv/linux/msgsnd.c (msgsnd): Add cast to avoid warning. + * sysdeps/unix/sysv/linux/shmat.c (shmat): Likewise. + 2000-09-06 Andreas Schwab * sysdeps/unix/sysv/linux/ia64/bits/time.h: New file. diff --git a/assert/__assert.c b/assert/__assert.c index 50ebac5bf8..cad3fe4ac0 100644 --- a/assert/__assert.c +++ b/assert/__assert.c @@ -16,6 +16,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* We have to see the prototype. */ +#undef NDEBUG #include void diff --git a/sysdeps/unix/sysv/linux/msgsnd.c b/sysdeps/unix/sysv/linux/msgsnd.c index a068556496..13cc1f979e 100644 --- a/sysdeps/unix/sysv/linux/msgsnd.c +++ b/sysdeps/unix/sysv/linux/msgsnd.c @@ -34,5 +34,5 @@ msgsnd (msqid, msgp, msgsz, msgflg) int msgflg; { return INLINE_SYSCALL (ipc, 5, IPCOP_msgsnd, msqid, msgsz, - msgflg, CHECK_N (msgp, msgsz)); + msgflg, (void *) CHECK_N (msgp, msgsz)); } diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c index dc5a848eaa..b7e9a95d10 100644 --- a/sysdeps/unix/sysv/linux/shmat.c +++ b/sysdeps/unix/sysv/linux/shmat.c @@ -48,7 +48,7 @@ shmat (shmid, shmaddr, shmflg) #endif result = (void *__unbounded) INLINE_SYSCALL (ipc, 5, IPCOP_shmat, shmid, shmflg, - __ptrvalue (&raddr), + (long int) __ptrvalue (&raddr), __ptrvalue (shmaddr)); if ((unsigned long) result <= -(unsigned long) SHMLBA) result = raddr; -- cgit 1.4.1