diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-08-29 00:34:10 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-08-29 00:34:10 +0000 |
| commit | 5fe14d967045adf037e12a5945ac56de151c2ae2 (patch) | |
| tree | a4dd7e7664ff9227560b4a0368b3d65fb68abb10 /sysdeps/pthread/aio_cancel.c | |
| parent | 9e7f59b4b54f0a5c0d569596c961f62238ca4dfd (diff) | |
| download | glibc-5fe14d967045adf037e12a5945ac56de151c2ae2.tar.gz glibc-5fe14d967045adf037e12a5945ac56de151c2ae2.tar.xz glibc-5fe14d967045adf037e12a5945ac56de151c2ae2.zip | |
Update.
* sysdeps/generic/ldsodefs.h (__rtld_global_attribute__): Define. (_rtld_global): Use it. * sysdeps/gnu/Dist: Remove errlist-compat.c. * sysdeps/gnu/Makefile (errlist-compat.c): Build this file in the object directory. Pass all Versions files to the awk script. * sysdeps/gnu/errlist-compat.c: Removed. * sysdeps/gnu/errlist.awk: Use #errlist-compat comments from the first Versions file in the search path which has them. Allow multiple errlist symbol versions to have the same count of errors. * sysdeps/gnu/errlist-compat.awk: Include <errlist-compat.c> instead of "errlist-compat.c". * sysdeps/gnu/errlist.c: Regenerated. * sysdeps/unix/sysv/linux/mips/Versions (libc): Add #errlist-compat comments at GLIBC_2.0, GLIBC_2.1 and GLIBC_2.3. * sysdeps/unix/sysv/linux/alpha/Versions: Likewise. (librt): Add aio_cancel and aio_cancel64 as GLIBC_2.3. * sysdeps/unix/sysv/linux/hppa/Versions: Likewise. * sysdeps/unix/sysv/linux/sparc/Versions: New file. * sysdeps/unix/sysv/linux/alpha/bits/errno.h: New file. * sysdeps/unix/sysv/linux/hppa/bits/errno.h (ECANCELED): Define to ECANCELLED if not defined by kernel headers. * sysdeps/unix/sysv/linux/bits/errno.h: Don't redefine ECANCELED if already defined by kernel headers. * sysdeps/unix/sysv/linux/sparc/bits/errno.h: New file. * sysdeps/pthread/aio_cancel.c: Don't include aio.h and its aio_cancel64 renaming hack nor provide weak_alias if aio_cancel is a macro. * Versions.def (GLIBC_2.3) [librt]: Add. * sysdeps/unix/sysv/linux/alpha/pipe.S: New file. 2002-08-28 Ulrich Drepper <drepper@redhat.com> * include/libc-symbols.h [!__ASSEMBLER__] (declare_symbol_1): Add missing comma to .type directive. 2002-08-28 Jakub Jelinek <jakub@redhat.com>
Diffstat (limited to 'sysdeps/pthread/aio_cancel.c')
| -rw-r--r-- | sysdeps/pthread/aio_cancel.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sysdeps/pthread/aio_cancel.c b/sysdeps/pthread/aio_cancel.c index d62586b903..b2f7be1935 100644 --- a/sysdeps/pthread/aio_cancel.c +++ b/sysdeps/pthread/aio_cancel.c @@ -24,10 +24,12 @@ we want to avoid code duplication by using aliases. But gcc sees the different parameter lists and prints a warning. We define here a function so that aio_cancel64 has no prototype. */ +#ifndef aio_cancel #define aio_cancel64 XXX #include <aio.h> /* And undo the hack. */ #undef aio_cancel64 +#endif #include <assert.h> #include <errno.h> @@ -146,4 +148,6 @@ aio_cancel (fildes, aiocbp) return result; } +#ifndef aio_cancel weak_alias (aio_cancel, aio_cancel64) +#endif |