[BZ #2182]

	* math/s_cacosh.c: Return values from positive branch.
	* math/s_cacoshf.c: Likewise.
	* math/s_cacoshl.c: Likewise.

	* sysvipc/msgrcv.c: Likewise.
	* include/sys/msg.h: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2f222e81251146b1cc4d61edfff4775b432256eb..34428caa545330a8debd020e9032da52a9b70058 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
 2006-08-03  Ulrich Drepper  <drepper@redhat.com>
 
+       [BZ #2182]
+       * math/s_cacosh.c: Return values from positive branch.
+       * math/s_cacoshf.c: Likewise.
+       * math/s_cacoshl.c: Likewise.
+
        [BZ #2883]
        * sysvipc/sys/msg.h: Change return value to ssize_t.
        * sysdeps/unix/sysv/linux/msgrcv.c: Likewise.
+       * sysvipc/msgrcv.c: Likewise.
+       * include/sys/msg.h: Likewise.
 
        * grp/initgroups.c (internal_getgrouplist): Remove unnecessary
        test introduced in patch for bz #661.

diff --git a/include/sys/msg.h b/include/sys/msg.h
index 02bb9aefd0ee23f4d3ee43863ecf1906d90fa93d..03e17f915ed2f3044ed94d142f7cb6176a3f8cc8 100644 (file)
--- a/include/sys/msg.h
+++ b/include/sys/msg.h
@@ -1,8 +1,8 @@
 #ifndef _SYS_MSG_H
 #include <sysvipc/sys/msg.h>
 
-extern int __libc_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp,
-                         int msgflg);
+extern ssize_t __libc_msgrcv (int msqid, void *msgp, size_t msgsz,
+                             long int msgtyp, int msgflg);
 extern int __libc_msgsnd (int msqid, const void *msgp, size_t msgsz,
                          int msgflg);
 

diff --git a/math/s_cacosh.c b/math/s_cacosh.c
index e921f0763e96ae5438e6ef05abdf838f2d3d30d0..ada7ca5af6163a903cc831e3ad56949afda59920 100644 (file)
--- a/math/s_cacosh.c
+++ b/math/s_cacosh.c
@@ -80,6 +80,10 @@ __cacosh (__complex__ double x)
       __imag__ y += __imag__ x;
 
       res = __clog (y);
+
+      /* We have to use the positive branch.  */
+      if (__real__ res < 0.0)
+       res = -res;
     }
 
   return res;

diff --git a/math/s_cacoshf.c b/math/s_cacoshf.c
index 3fc48bb617fbd099900b6636179ed56da3dc2941..a062ffc6f6e7cb797ac272a33322a731a3215c47 100644 (file)
--- a/math/s_cacoshf.c
+++ b/math/s_cacoshf.c
@@ -95,6 +95,10 @@ __cacoshf (__complex__ float x)
                                           + ro);
       __imag__ res = __ieee754_atan2f (__imag__ x + b, __real__ x + a);
 #endif
+
+      /* We have to use the positive branch.  */
+      if (__real__ res < 0.0)
+       res = -res;
     }
 
   return res;

diff --git a/math/s_cacoshl.c b/math/s_cacoshl.c
index 643858920e5bca0a04e4b7315a5bd38e01645fbf..da23c8d8aaa27c9a82e90bc98d09cfd5c23befa6 100644 (file)
--- a/math/s_cacoshl.c
+++ b/math/s_cacoshl.c
@@ -80,6 +80,10 @@ __cacoshl (__complex__ long double x)
       __imag__ y += __imag__ x;
 
       res = __clogl (y);
+
+      /* We have to use the positive branch.  */
+      if (__real__ res < 0.0)
+       res = -res;
     }
 
   return res;

diff --git a/sysvipc/msgrcv.c b/sysvipc/msgrcv.c
index f366fa8170aaacc3d521a9389a28f9d161c5e24d..83732b311395920528088de607f30813be747fe3 100644 (file)
--- a/sysvipc/msgrcv.c
+++ b/sysvipc/msgrcv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -26,7 +26,7 @@
    describes which message is returned in MSGFLG describes the behaviour
    in buffer overflow or queue underflow.  */
 
-int
+ssize_t
 msgrcv (msqid, msgp, msgsz, msgtyp, msgflg)
      int msqid;
      void *msgp;