diff options
| author | deischen <deischen@FreeBSD.org> | 2001-01-29 03:24:23 +0000 |
|---|---|---|
| committer | deischen <deischen@FreeBSD.org> | 2001-01-29 03:24:23 +0000 |
| commit | c3dd7e380ee3ca227730ab6a8daa4e35ad4f004e (patch) | |
| tree | 7ae1ada95686efa301d58e63fe3c182ea5e71404 /lib/libkse | |
| parent | ca55abf319c2f815cb2c84655b25482829c1646d (diff) | |
| download | FreeBSD-src-c3dd7e380ee3ca227730ab6a8daa4e35ad4f004e.zip FreeBSD-src-c3dd7e380ee3ca227730ab6a8daa4e35ad4f004e.tar.gz | |
_exit in libc is now __sys_exit not __sys__exit.
Add another check for thread library initialization (jdp, we
really need a way to get _thread_init called at program start
before any constructors are run).
Diffstat (limited to 'lib/libkse')
| -rw-r--r-- | lib/libkse/thread/thr_exit.c | 7 | ||||
| -rw-r--r-- | lib/libkse/thread/thr_private.h | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/libkse/thread/thr_exit.c b/lib/libkse/thread/thr_exit.c index 42bf025..169aa4f 100644 --- a/lib/libkse/thread/thr_exit.c +++ b/lib/libkse/thread/thr_exit.c @@ -43,10 +43,9 @@ #define FLAGS_IN_SCHEDQ \ (PTHREAD_FLAGS_IN_PRIOQ|PTHREAD_FLAGS_IN_WAITQ|PTHREAD_FLAGS_IN_WORKQ) -#pragma weak _exit=__exit #pragma weak pthread_exit=_pthread_exit -void __exit(int status) +void _exit(int status) { int flags; int i; @@ -79,7 +78,7 @@ void __exit(int status) } /* Call the _exit syscall: */ - __sys__exit(status); + __sys_exit(status); } void @@ -104,7 +103,7 @@ _thread_exit(char *fname, int lineno, char *string) #if defined(_PTHREADS_INVARIANTS) abort(); #else - _exit(1); + __sys_exit(1); #endif } diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h index 688a2b3..66f8121 100644 --- a/lib/libkse/thread/thr_private.h +++ b/lib/libkse/thread/thr_private.h @@ -1281,8 +1281,8 @@ void _thread_enter_cancellation_point(void); void _thread_leave_cancellation_point(void); void _thread_cancellation_point(void); -/* #include <aio.h> */ -#ifdef _AIO_H_ +/* #include <sys/aio.h> */ +#ifdef _SYS_AIO_H_ int __sys_aio_suspend(const struct aiocb **, int, const struct timespec); #endif @@ -1349,7 +1349,7 @@ int __sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); long __sys_fpathconf(int, int); ssize_t __sys_read(int, void *, size_t); ssize_t __sys_write(int, const void *, size_t); -void __sys__exit(int); +void __sys_exit(int); #endif /* #include <fcntl.h> */ |
