diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-02-23 23:12:42 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-02-23 23:12:42 -0800 |
| commit | f1037d0b8b95cf2afcbacededaae1627b3cb22f1 (patch) | |
| tree | 7c53e9d94a127a52be32386e81c8295a700eb63d /m4/timer_time.m4 | |
| parent | 8ee4c296ecae9e354bc743fad0fd7f5a5e49e1a2 (diff) | |
| download | emacs-f1037d0b8b95cf2afcbacededaae1627b3cb22f1.tar.gz | |
Merge from gnulib.
2014-02-21 timer: fix uClibc detection of threading
2014-02-21 maintainer-makefiles: provide AC_PROG_SED for older autoconf
* texinfo.tex: Update from gnulib.
Diffstat (limited to 'm4/timer_time.m4')
| -rw-r--r-- | m4/timer_time.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/timer_time.m4 b/m4/timer_time.m4 index 6eceadd59a3..8e2c921cbef 100644 --- a/m4/timer_time.m4 +++ b/m4/timer_time.m4 @@ -28,7 +28,7 @@ AC_DEFUN([gl_TIMER_TIME], #include <features.h> #ifdef __GNU_LIBRARY__ #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \ - && !defined __UCLIBC__ + && !(__UCLIBC__ && __HAS_NO_THREADS__) Thread emulation available #endif #endif |