diff options
| author | Paul Eggert | 2016-10-27 08:27:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-10-27 08:28:07 -0700 |
| commit | 63eebff30e91f4a29d2870d42cab859e7fef628b (patch) | |
| tree | 44fb2131272d7ace0225fe7fab9ab5dcb9dff93f /lib/stdlib.in.h | |
| parent | 354c4a9885db314a4bd8a11cd6f11badef7b07f3 (diff) | |
| download | emacs-63eebff30e91f4a29d2870d42cab859e7fef628b.tar.gz emacs-63eebff30e91f4a29d2870d42cab859e7fef628b.zip | |
Update from gnulib
This incorporates:
2016-10-16 qsort_r: Fix macrology for platforms that lack the function.
2016-10-13 stdint: port SIZE_MAX to glibc s390
2016-10-11 maint: remove stray space after "." in AC_DEFINE comment.
* lib/gnulib.mk: Regenerate.
* lib/stdlib.in.h, m4/st_dm_mode.m4, m4/stdint.m4, m4/stdlib_h.m4:
* m4/utimes.m4: Copy from gnulib.
Diffstat (limited to 'lib/stdlib.in.h')
| -rw-r--r-- | lib/stdlib.in.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index 70dc88db753..db3253bd970 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h | |||
| @@ -521,6 +521,9 @@ _GL_CXXALIASWARN (putenv); | |||
| 521 | #endif | 521 | #endif |
| 522 | 522 | ||
| 523 | #if @GNULIB_QSORT_R@ | 523 | #if @GNULIB_QSORT_R@ |
| 524 | /* Sort an array of NMEMB elements, starting at address BASE, each element | ||
| 525 | occupying SIZE bytes, in ascending order according to the comparison | ||
| 526 | function COMPARE. */ | ||
| 524 | # if @REPLACE_QSORT_R@ | 527 | # if @REPLACE_QSORT_R@ |
| 525 | # if !(defined __cplusplus && defined GNULIB_NAMESPACE) | 528 | # if !(defined __cplusplus && defined GNULIB_NAMESPACE) |
| 526 | # undef qsort_r | 529 | # undef qsort_r |
| @@ -535,12 +538,24 @@ _GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, | |||
| 535 | void *), | 538 | void *), |
| 536 | void *arg)); | 539 | void *arg)); |
| 537 | # else | 540 | # else |
| 541 | # if !@HAVE_QSORT_R@ | ||
| 542 | _GL_FUNCDECL_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, | ||
| 543 | int (*compare) (void const *, void const *, | ||
| 544 | void *), | ||
| 545 | void *arg) _GL_ARG_NONNULL ((1, 4))); | ||
| 546 | # endif | ||
| 538 | _GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, | 547 | _GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, |
| 539 | int (*compare) (void const *, void const *, | 548 | int (*compare) (void const *, void const *, |
| 540 | void *), | 549 | void *), |
| 541 | void *arg)); | 550 | void *arg)); |
| 542 | # endif | 551 | # endif |
| 543 | _GL_CXXALIASWARN (qsort_r); | 552 | _GL_CXXALIASWARN (qsort_r); |
| 553 | #elif defined GNULIB_POSIXCHECK | ||
| 554 | # undef qsort_r | ||
| 555 | # if HAVE_RAW_DECL_QSORT_R | ||
| 556 | _GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - " | ||
| 557 | "use gnulib module qsort_r for portability"); | ||
| 558 | # endif | ||
| 544 | #endif | 559 | #endif |
| 545 | 560 | ||
| 546 | 561 | ||