Skip to content

Commit b968b73

Browse files
committed
Merge from origin/emacs-27
6cd9ccb (origin/emacs-27) Fix compression of directories in Dired 42329e6 ; * etc/NEWS: Review of the whole text. af5709f Further enhancement on `tramp-file-local-name' fb43244 Objective C Mode imenu: cease recognizing "functions" with... a18373a ; * etc/NEWS: Update the text about the XDG_CONFIG_HOME/em... 73fd8a4 Fix BSD and macOS builds w.r.t. pthread_setname_np (bug#38... f54b243 Scale top-left coordinates in display-monitor-attributes-list b46c75b xref-matches-in-files: Big Tramp speed-up 883b349 * lisp/net/tramp.el (tramp-file-local-name): Remove `save-... c01f55f Fix rendering bug due to unsynchronized cairo surface size... 075f21c Avoid crash by access to cleared img->pixmap->data/img->ma... 16c6dfb Avoid assertion violations in very small-height windows 9063124 Use pthread_setname_np to set thread name # Conflicts: # etc/NEWS # lisp/net/tramp.el
2 parents f8a0b02 + 6cd9ccb commit b968b73

File tree

14 files changed

+325
-244
lines changed

14 files changed

+325
-244
lines changed

configure.ac

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,7 @@ AC_CHECK_HEADERS_ONCE(
17671767
sys/sysinfo.h
17681768
coff.h pty.h
17691769
sys/resource.h
1770-
sys/utsname.h pwd.h utmp.h util.h sys/prctl.h)
1770+
sys/utsname.h pwd.h utmp.h util.h)
17711771

17721772
AC_CACHE_CHECK([for ADDR_NO_RANDOMIZE],
17731773
[emacs_cv_personality_addr_no_randomize],
@@ -4192,9 +4192,26 @@ pthread_sigmask strsignal setitimer timer_getoverrun \
41924192
sendto recvfrom getsockname getifaddrs freeifaddrs \
41934193
gai_strerror sync \
41944194
getpwent endpwent getgrent endgrent \
4195-
cfmakeraw cfsetspeed __executable_start log2 prctl)
4195+
cfmakeraw cfsetspeed __executable_start log2 pthread_setname_np)
41964196
LIBS=$OLD_LIBS
41974197

4198+
if test "$ac_cv_func_pthread_setname_np" = "yes"; then
4199+
AC_CACHE_CHECK(
4200+
[whether pthread_setname_np takes a single argument],
4201+
[emacs_cv_pthread_setname_np_1arg],
4202+
[AC_COMPILE_IFELSE(
4203+
[AC_LANG_PROGRAM(
4204+
[[#include <pthread.h>]],
4205+
[[pthread_setname_np ("a");]])],
4206+
[emacs_cv_pthread_setname_np_1arg=yes],
4207+
[emacs_cv_pthread_setname_np_1arg=no])])
4208+
if test "$emacs_cv_pthread_setname_np_1arg" = "yes"; then
4209+
AC_DEFINE(
4210+
HAVE_PTHREAD_SETNAME_NP_1ARG, 1,
4211+
[Define to 1 if pthread_setname_np takes a single argument.])
4212+
fi
4213+
fi
4214+
41984215
dnl No need to check for posix_memalign if aligned_alloc works.
41994216
AC_CHECK_FUNCS([aligned_alloc posix_memalign], [break])
42004217
AC_CHECK_DECLS([aligned_alloc], [], [], [[#include <stdlib.h>]])

0 commit comments

Comments
 (0)