Update.

	* posix/Makefile (CFLAGS-regex.c): Remove RE_ENABLE_I18N definition.
	* posix/regex_internal.h (RE_ENABLE_I18N): Pretty printing.

diff --git a/ChangeLog b/ChangeLog
index e74f032..ca4d73f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-02-23  Ulrich Drepper  <drepper@redhat.com>
 
+       * posix/Makefile (CFLAGS-regex.c): Remove RE_ENABLE_I18N definition.
+       * posix/regex_internal.h (RE_ENABLE_I18N): Pretty printing.
+
        * resolv/res_libc.c [USE___THREAD] (_res): Initialize _vcsock
        element to -1.
 

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index c44f1f5..e79356a 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
 2003-02-23  Ulrich Drepper  <drepper@redhat.com>
 
+       * libc-cancellation.c (__libc_enable_asynccancel): Correct test
+       for failed cmpxchg.
+
        * pthread_create.c (start_thread): Set EXITING_BIT early.
 
        * sysdeps/i386/tls.h (THREAD_GETMEM): Mark asm as volatile.

diff --git a/nptl/libc-cancellation.c b/nptl/libc-cancellation.c
index af56891..d9ad94f 100644 (file)
--- a/nptl/libc-cancellation.c
+++ b/nptl/libc-cancellation.c
@@ -47,7 +47,7 @@ __libc_enable_asynccancel (void)
            break;
 
          if (atomic_compare_and_exchange_acq (&self->cancelhandling, newval,
-                                              oldval) == 0)
+                                              oldval) != 0)
            /* Somebody else modified the word, try again.  */
            continue;
 

diff --git a/posix/Makefile b/posix/Makefile
index 6b2830a..78619d1 100644 (file)
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1991-1999, 2000, 2001, 2002, 2003 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
@@ -115,7 +115,7 @@ $(objpfx)wordexp-tst.out: wordexp-tst.sh $(objpfx)wordexp-test
 endif
 endif
 
-CFLAGS-regex.c = -Wno-strict-prototypes -DRE_ENABLE_I18N
+CFLAGS-regex.c = -Wno-strict-prototypes
 CFLAGS-getaddrinfo.c = -DRESOLVER
 tstgetopt-ARGS = -a -b -cfoobar --required foobar --optional=bazbug \
                --none random --col --color --colour

diff --git a/posix/regex_internal.h b/posix/regex_internal.h
index 9487256..bf84ad6 100644 (file)
--- a/posix/regex_internal.h
+++ b/posix/regex_internal.h
@@ -74,8 +74,8 @@
 # define gettext_noop(String) String
 #endif
 
-#if (defined (MB_CUR_MAX) && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC
-#define RE_ENABLE_I18N
+#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC
+# define RE_ENABLE_I18N
 #endif
 
 #if __GNUC__ >= 3