Update.

2000-09-07  Ulrich Drepper  <drepper@redhat.com>

	* assert/__assert.c: Undefine NDEBUG before include <assert.h>.

	* sysdeps/unix/sysv/linux/msgsnd.c (msgsnd): Add cast to avoid warning.
	* sysdeps/unix/sysv/linux/shmat.c (shmat): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 9baa5b77671d9a8f8d98850a83618159835c38f3..356e51fb603b154c5a4a3736559723812853f308 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-07  Ulrich Drepper  <drepper@redhat.com>
+
+       * assert/__assert.c: Undefine NDEBUG before include <assert.h>.
+
+       * 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  <schwab@suse.de>
 
        * sysdeps/unix/sysv/linux/ia64/bits/time.h: New file.

diff --git a/assert/__assert.c b/assert/__assert.c
index 50ebac5bf83aaa535636791b9f807f5e9a574430..cad3fe4ac073e2d16aee666156ace8c1971d473c 100644 (file)
--- 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 <assert.h>
 
 void

diff --git a/sysdeps/unix/sysv/linux/msgsnd.c b/sysdeps/unix/sysv/linux/msgsnd.c
index a06855649673499bf2a275c22578adaaf766eb1a..13cc1f979e1d16a965096550d6c39393e1ae1969 100644 (file)
--- 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 dc5a848eaa2aa4ce427549045d322a97ef72c66b..b7e9a95d1089c5d44459c15a7f82c623ee63334e 100644 (file)
--- 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;