diff options
| author | Nick Alcock <nick.alcock@oracle.com> | 2019-06-03 14:02:09 +0100 |
|---|---|---|
| committer | Nick Alcock <nick.alcock@oracle.com> | 2019-06-04 17:05:08 +0100 |
| commit | 6b22174ff163b828a2069f22353018ca97fc0fb4 (patch) | |
| tree | 25224c057c20981bff2e95d098b189673f3e6847 /libctf/config.h.in | |
| parent | 941accce38bc70a23c62e3c9439b67bf23298124 (diff) | |
| download | fsf-binutils-gdb-6b22174ff163b828a2069f22353018ca97fc0fb4.zip fsf-binutils-gdb-6b22174ff163b828a2069f22353018ca97fc0fb4.tar.gz fsf-binutils-gdb-6b22174ff163b828a2069f22353018ca97fc0fb4.tar.bz2 | |
libctf: look for BSD versus GNU qsort_r signatures
We cannot just look for any declaration of qsort_r, because some
operating systems have a qsort_r that has a different prototype
but which still has a pair of pointers in the right places (the last two
args are interchanged): so use AC_LINK_IFELSE to check for both
known variants of qsort_r(), and swap their args into a consistent order
in a suitable inline function. (The code for this is taken almost
unchanged from gnulib.)
(Now we are not using AC_LIBOBJ any more, we can use a better name for
the qsort_r replacement as well.)
libctf/
* qsort_r.c: Rename to...
* ctf-qsort_r.c: ... this.
(_quicksort): Define to ctf_qsort_r.
* ctf-decls.h (qsort_r): Remove.
(ctf_qsort_r): Add.
(struct ctf_qsort_arg): New, transport the real ARG and COMPAR.
(ctf_qsort_compar_thunk): Rearrange the arguments to COMPAR.
* Makefile.am (libctf_a_LIBADD): Remove.
(libctf_a_SOURCES): New, add ctf-qsort_r.c.
* ctf-archive.c (ctf_arc_write): Call ctf_qsort_r, not qsort_r.
* ctf-create.c (ctf_update): Likewise.
* configure.ac: Check for BSD versus GNU qsort_r signature.
* Makefile.in: Regenerate.
* config.h.in: Likewise.
* configure: Likewise.
Diffstat (limited to 'libctf/config.h.in')
| -rw-r--r-- | libctf/config.h.in | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libctf/config.h.in b/libctf/config.h.in index 0ecb5bb..d81c500 100644 --- a/libctf/config.h.in +++ b/libctf/config.h.in @@ -9,10 +9,6 @@ /* Define to 1 if you have the <byteswap.h> header file. */ #undef HAVE_BYTESWAP_H -/* Define to 1 if you have the declaration of `qsort_r', and to 0 if you - don't. */ -#undef HAVE_DECL_QSORT_R - /* Define to 1 if you have the <endian.h> header file. */ #undef HAVE_ENDIAN_H @@ -31,6 +27,15 @@ /* Define to 1 if you have the `pread' function. */ #undef HAVE_PREAD +/* Define to 1 if you have the `qsort_r' function. */ +#undef HAVE_QSORT_R + +/* Whether a qsort_r exists with a void *arg as its last arg. */ +#undef HAVE_QSORT_R_ARG_LAST + +/* Whether a qsort_r exists with the compar function as its last arg. */ +#undef HAVE_QSORT_R_COMPAR_LAST + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H |