* debug/tst-chk1.c (ret): New volatile variable.

	(CHK_FAIL_END): Remove redundant ret setting.
	(do_test): Remote ret variable.

diff --git a/ChangeLog b/ChangeLog
index b1f07a9..280c717 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-02  Jakub Jelinek  <jakub@redhat.com>
+
+       * debug/tst-chk1.c (ret): New volatile variable.
+       (CHK_FAIL_END): Remove redundant ret setting.
+       (do_test): Remote ret variable.
+
 2004-01-03  Paolo Bonzini  <bonzini@gnu.org>
 
        * posix/regex_internal.h (__regfree) [!_LIBC]: Define to regfree.

diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c
index 639da38..ef7f278 100644 (file)
--- a/debug/tst-chk1.c
+++ b/debug/tst-chk1.c
@@ -50,7 +50,7 @@ do_prepare (void)
     }
 }
 
-volatile int chk_fail_ok;
+volatile int chk_fail_ok, ret;
 jmp_buf chk_fail_buf;
 
 static void
@@ -86,7 +86,6 @@ int num2 = 987654;
 #define CHK_FAIL_END \
       chk_fail_ok = 0;                         \
       FAIL ();                                 \
-      ret = 1;                                 \
     }
 #if __USE_FORTIFY_LEVEL >= 2
 #define CHK_FAIL2_START CHK_FAIL_START
@@ -99,7 +98,6 @@ int num2 = 987654;
 static int
 do_test (void)
 {
-  int ret = 0;
   struct sigaction sa;
   sa.sa_handler = handler;
   sa.sa_flags = 0;

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 33e2d8a..f7c87c2 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-02  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/unix/sysv/linux/smp.h: Include <errno.h>.
+
 2004-10-29  Kaz  Kojima  <kkojima@rr.iij4u.or.jp>
 
        * sysdeps/unix/sysv/linux/sh/sem_timedwait.S (sem_timedwait):

diff --git a/nptl/sysdeps/unix/sysv/linux/smp.h b/nptl/sysdeps/unix/sysv/linux/smp.h
index c1160a7..4f4d358 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/smp.h
+++ b/nptl/sysdeps/unix/sysv/linux/smp.h
@@ -17,6 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/sysctl.h>