mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
Update from Gnulib by running admin/merge-gnulib
* admin/merge-gnulib (GNULIB_MODULES): Add stringeq. With current Gnulib it is already present as in indirect dependency; listing it here because Emacs now depends on it directly. * lib-src/ebrowse.c, lib-src/etags.c: (streq): Remove, as Gnulib defines this now. * lib/fseterr.c, lib/fseterr.h, lib/issymlink.c, lib/issymlink.h: * lib/issymlinkat.c, lib/stdio-consolesafe.c, lib/string.c: * m4/fseterr.m4, m4/gettext_h.m4, m4/stringeq.m4: New files from Gnulib. * src/conf_post.h (tzfree) [__ANDROID_API__ >= 35]: Remove.
This commit is contained in:
parent
327c16ce14
commit
59fbaca6b9
115 changed files with 1733 additions and 1097 deletions
|
|
@ -26,10 +26,6 @@
|
|||
# include <string.h>
|
||||
#endif
|
||||
|
||||
#if PTHREAD_SIGMASK_UNBLOCK_BUG
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
int
|
||||
pthread_sigmask (int how, const sigset_t *new_mask, sigset_t *old_mask)
|
||||
#undef pthread_sigmask
|
||||
|
|
@ -58,7 +54,7 @@ pthread_sigmask (int how, const sigset_t *new_mask, sigset_t *old_mask)
|
|||
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 (memcmp (&omask_copy, &omask, sizeof omask) == 0
|
||||
if (memeq (&omask_copy, &omask, sizeof omask)
|
||||
&& pthread_sigmask (1729, &omask_copy, NULL) == 0)
|
||||
{
|
||||
/* pthread_sigmask is currently ineffective. The program is not
|
||||
|
|
@ -73,16 +69,6 @@ pthread_sigmask (int how, const sigset_t *new_mask, sigset_t *old_mask)
|
|||
# if PTHREAD_SIGMASK_FAILS_WITH_ERRNO
|
||||
if (ret == -1)
|
||||
return errno;
|
||||
# endif
|
||||
# if PTHREAD_SIGMASK_UNBLOCK_BUG
|
||||
if (ret == 0
|
||||
&& new_mask != NULL
|
||||
&& (how == SIG_UNBLOCK || how == SIG_SETMASK))
|
||||
{
|
||||
/* Give the OS the opportunity to raise signals that were pending before
|
||||
the pthread_sigmask call and have now been unblocked. */
|
||||
usleep (1);
|
||||
}
|
||||
# endif
|
||||
return ret;
|
||||
#else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue