[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109099: Merge from gnulib.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109099: Merge from gnulib. |
Date: |
Sun, 15 Jul 2012 11:18:37 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109099
fixes bug: http://debbugs.gnu.org/11884
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-07-15 11:18:37 -0700
message:
Merge from gnulib.
2012-07-15 pthread_sigmask: fix bug on FreeBSD 9 (Bug#11884)
2012-07-11 gettext: do not assume '#define ... defined ...' behavior
modified:
ChangeLog
lib/gettext.h
lib/pthread_sigmask.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-14 02:08:32 +0000
+++ b/ChangeLog 2012-07-15 18:18:37 +0000
@@ -1,3 +1,9 @@
+2012-07-15 Paul Eggert <address@hidden>
+
+ Merge from gnulib, incorporating:
+ 2012-07-15 pthread_sigmask: fix bug on FreeBSD 9 (Bug#11884)
+ 2012-07-11 gettext: do not assume '#define ... defined ...' behavior
+
2012-07-14 Glenn Morris <address@hidden>
* configure.ac (GC_SETJMP_WORKS, GC_MARK_STACK): Move here from src/s.
=== modified file 'lib/gettext.h'
--- a/lib/gettext.h 2012-05-26 23:14:36 +0000
+++ b/lib/gettext.h 2012-07-15 18:18:37 +0000
@@ -183,9 +183,12 @@
#include <string.h>
-#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
- (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
- /* || __STDC_VERSION__ >= 199901L */ )
+#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
+ /* || __STDC_VERSION__ >= 199901L */ )
+# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
+#else
+# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
+#endif
#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
#include <stdlib.h>
=== modified file 'lib/pthread_sigmask.c'
--- a/lib/pthread_sigmask.c 2012-05-26 23:14:36 +0000
+++ b/lib/pthread_sigmask.c 2012-07-15 18:18:37 +0000
@@ -22,6 +22,10 @@
#include <errno.h>
#include <stddef.h>
+#if PTHREAD_SIGMASK_INEFFECTIVE
+# include <string.h>
+#endif
+
#if PTHREAD_SIGMASK_UNBLOCK_BUG
# include <unistd.h>
#endif
@@ -31,7 +35,22 @@
#undef pthread_sigmask
{
#if HAVE_PTHREAD_SIGMASK
- int ret = pthread_sigmask (how, new_mask, old_mask);
+ int ret;
+
+# if PTHREAD_SIGMASK_INEFFECTIVE
+ sigset_t omask, omask_copy;
+ sigset_t *old_mask_ptr = &omask;
+ sigemptyset (&omask);
+ /* Add a signal unlikely to be blocked, so that OMASK_COPY
+ is unlikely to match the actual mask. */
+ sigaddset (&omask, SIGILL);
+ memcpy (&omask_copy, &omask, sizeof omask);
+# else
+ sigset_t *old_mask_ptr = old_mask;
+# endif
+
+ ret = pthread_sigmask (how, new_mask, old_mask_ptr);
+
# if PTHREAD_SIGMASK_INEFFECTIVE
if (ret == 0)
{
@@ -39,12 +58,16 @@
Don't cache the information: libpthread.so could be dynamically
loaded after the program started and after pthread_sigmask was
called for the first time. */
- if (pthread_sigmask (1729, NULL, NULL) == 0)
+ if (memcmp (&omask_copy, &omask, sizeof omask) == 0
+ && pthread_sigmask (1729, &omask_copy, NULL) == 0)
{
/* pthread_sigmask is currently ineffective. The program is not
linked to -lpthread. So use sigprocmask instead. */
return (sigprocmask (how, new_mask, old_mask) < 0 ? errno : 0);
}
+
+ if (old_mask)
+ memcpy (old_mask, &omask, sizeof omask);
}
# endif
# if PTHREAD_SIGMASK_FAILS_WITH_ERRNO
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109099: Merge from gnulib.,
Paul Eggert <=