From d8cf93f489282ed4dd0b727e9efd9efef192e952 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 31 Dec 1999 18:51:25 +0000 Subject: Update. 1999-12-31 Andreas Jaeger * libio/strfile.h: Remove K&R compatibility. * locale/langinfo.h: Likewise. * locale/localeconv.c (localeconv): Likewise. * locale/programs/simple-hash.h: Likewise. * nis/nis_xdr.h: Likewise. * nis/rpcsvc/nislib.h: Likewise. * nis/rpcsvc/nis_callback.h: Likewise. * nis/rpcsvc/nis.h: Likewise. * nis/ypclnt.c: Likewise. * nscd/nscd_proto.h: Likewise. * nscd/nscd.c: Likewise. * sysdeps/generic/inttypes.h: Likewise. * sysdeps/gnu/utmpx.h: Likewise. * nis/nis_intern.h: Remove K&R compatibility; add missing ints. * sunrpc/rpcsvc/rusers.x: Likewise. * nis/rpcsvc/ypclnt.h: Remove K&R compatibility; reformat. * elf/dl-misc.c: Remove __libc_write prototype since it's already in include/unistd.h. * elf/dl-profile.c: Likewise. * elf/dl-load.c: Likewise for __libc_read. * elf/dl-profile.c: Remove __P. * elf/sprof.c: Likewise. * elf/sln.c: Likewise. --- linuxthreads/internals.h | 30 ++++++++++------------ linuxthreads/sysdeps/pthread/bits/libc-lock.h | 37 +++++++++++++++++++++++++++ linuxthreads/sysdeps/pthread/pthread.h | 21 --------------- linuxthreads/weaks.c | 8 +++--- 4 files changed, 55 insertions(+), 41 deletions(-) (limited to 'linuxthreads') diff --git a/linuxthreads/internals.h b/linuxthreads/internals.h index 2e4b4b79b7..c5fde1f883 100644 --- a/linuxthreads/internals.h +++ b/linuxthreads/internals.h @@ -355,31 +355,29 @@ void __fresetlockfiles(void); void __pthread_manager_adjust_prio(int thread_prio); extern int __pthread_attr_setguardsize (pthread_attr_t *__attr, - size_t __guardsize) __THROW; -extern int __pthread_attr_getguardsize (__const pthread_attr_t *__attr, - size_t *__guardsize) __THROW; + size_t __guardsize); +extern int __pthread_attr_getguardsize (const pthread_attr_t *__attr, + size_t *__guardsize); extern int __pthread_attr_setstackaddr (pthread_attr_t *__attr, - void *__stackaddr) __THROW; -extern int __pthread_attr_getstackaddr (__const pthread_attr_t *__attr, - void **__stackaddr) __THROW; + void *__stackaddr); +extern int __pthread_attr_getstackaddr (const pthread_attr_t *__attr, + void **__stackaddr); extern int __pthread_attr_setstacksize (pthread_attr_t *__attr, - size_t __stacksize) __THROW; -extern int __pthread_attr_getstacksize (__const pthread_attr_t *__attr, - size_t *__stacksize) __THROW; -extern int __pthread_getconcurrency (void) __THROW; -extern int __pthread_setconcurrency (int __level) __THROW; -extern int __pthread_mutexattr_gettype (__const pthread_mutexattr_t *__attr, - int *__kind) __THROW; -extern void __pthread_kill_other_threads_np (void) __THROW; + size_t __stacksize); +extern int __pthread_attr_getstacksize (const pthread_attr_t *__attr, + size_t *__stacksize); +extern int __pthread_getconcurrency (void); +extern int __pthread_setconcurrency (int __level); +extern int __pthread_mutexattr_gettype (const pthread_mutexattr_t *__attr, + int *__kind); +extern void __pthread_kill_other_threads_np (void); /* Prototypes for the function without cancelation support when the normal version has it. */ extern int __libc_close (int fd); extern int __libc_nanosleep (const struct timespec *requested_time, struct timespec *remaining); -extern ssize_t __libc_read (int fd, void *buf, size_t count); extern pid_t __libc_waitpid (pid_t pid, int *stat_loc, int options); -extern ssize_t __libc_write (int fd, const void *buf, size_t count); /* Prototypes for some of the new semaphore functions. */ extern int __new_sem_post (sem_t * sem); diff --git a/linuxthreads/sysdeps/pthread/bits/libc-lock.h b/linuxthreads/sysdeps/pthread/bits/libc-lock.h index a14cea1aa7..0f412bb9e2 100644 --- a/linuxthreads/sysdeps/pthread/bits/libc-lock.h +++ b/linuxthreads/sysdeps/pthread/bits/libc-lock.h @@ -166,6 +166,43 @@ typedef pthread_key_t __libc_key_t; #define __libc_atfork(PREPARE, PARENT, CHILD) \ (__pthread_atfork != NULL ? __pthread_atfork (PREPARE, PARENT, CHILD) : 0) +/* Functions that are used by this file and are internal to the GNU C + library. */ + +extern int __pthread_mutex_init (pthread_mutex_t *__mutex, + __const pthread_mutexattr_t *__mutex_attr); + +extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex); + +extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex); + +extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); + +extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); + +extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr); + +extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr); + +extern int __pthread_mutexattr_settype (pthread_mutexattr_t *__attr, + int __kind); + +extern int __pthread_key_create (pthread_key_t *__key, + void (*__destr_function) (void *)); + +extern int __pthread_setspecific (pthread_key_t __key, + __const void *__pointer); + +extern void *__pthread_getspecific (pthread_key_t __key); + +extern int __pthread_once (pthread_once_t *__once_control, + void (*__init_routine) (void)); + +extern int __pthread_atfork (void (*__prepare) (void), + void (*__parent) (void), + void (*__child) (void)); + + /* Make the pthread functions weak so that we can elide them from single-threaded processes. */ diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h index 5ce052b17f..b3606f7d08 100644 --- a/linuxthreads/sysdeps/pthread/pthread.h +++ b/linuxthreads/sysdeps/pthread/pthread.h @@ -270,27 +270,20 @@ extern int pthread_setconcurrency (int __level) __THROW; /* Initialize MUTEX using attributes in *MUTEX_ATTR, or use the default values if later is NULL. */ -extern int __pthread_mutex_init (pthread_mutex_t *__mutex, - __const pthread_mutexattr_t *__mutex_attr) - __THROW; extern int pthread_mutex_init (pthread_mutex_t *__mutex, __const pthread_mutexattr_t *__mutex_attr) __THROW; /* Destroy MUTEX. */ -extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex) __THROW; extern int pthread_mutex_destroy (pthread_mutex_t *__mutex) __THROW; /* Try to lock MUTEX. */ -extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex) __THROW; extern int pthread_mutex_trylock (pthread_mutex_t *__mutex) __THROW; /* Wait until lock for MUTEX becomes available and lock it. */ -extern int __pthread_mutex_lock (pthread_mutex_t *__mutex) __THROW; extern int pthread_mutex_lock (pthread_mutex_t *__mutex) __THROW; /* Unlock MUTEX. */ -extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex) __THROW; extern int pthread_mutex_unlock (pthread_mutex_t *__mutex) __THROW; @@ -298,19 +291,15 @@ extern int pthread_mutex_unlock (pthread_mutex_t *__mutex) __THROW; /* Initialize mutex attribute object ATTR with default attributes (kind is PTHREAD_MUTEX_FAST_NP). */ -extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr) __THROW; extern int pthread_mutexattr_init (pthread_mutexattr_t *__attr) __THROW; /* Destroy mutex attribute object ATTR. */ -extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr) __THROW; extern int pthread_mutexattr_destroy (pthread_mutexattr_t *__attr) __THROW; #ifdef __USE_UNIX98 /* Set the mutex kind attribute in *ATTR to KIND (either PTHREAD_MUTEX_NORMAL, PTHREAD_MUTEX_RECURSIVE, PTHREAD_MUTEX_ERRORCHECK, or PTHREAD_MUTEX_DEFAULT). */ -extern int __pthread_mutexattr_settype (pthread_mutexattr_t *__attr, - int __kind) __THROW; extern int pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind) __THROW; @@ -419,8 +408,6 @@ extern int pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *__attr, associated to that key when the key is destroyed. DESTR_FUNCTION is not called if the value associated is NULL when the key is destroyed. */ -extern int __pthread_key_create (pthread_key_t *__key, - void (*__destr_function) (void *)) __THROW; extern int pthread_key_create (pthread_key_t *__key, void (*__destr_function) (void *)) __THROW; @@ -428,13 +415,10 @@ extern int pthread_key_create (pthread_key_t *__key, extern int pthread_key_delete (pthread_key_t __key) __THROW; /* Store POINTER in the thread-specific data slot identified by KEY. */ -extern int __pthread_setspecific (pthread_key_t __key, - __const void *__pointer) __THROW; extern int pthread_setspecific (pthread_key_t __key, __const void *__pointer) __THROW; /* Return current value of the thread-specific data slot identified by KEY. */ -extern void *__pthread_getspecific (pthread_key_t __key) __THROW; extern void *pthread_getspecific (pthread_key_t __key) __THROW; @@ -444,8 +428,6 @@ extern void *pthread_getspecific (pthread_key_t __key) __THROW; only once, even if pthread_once is executed several times with the same ONCE_CONTROL argument. ONCE_CONTROL must point to a static or extern variable initialized to PTHREAD_ONCE_INIT. */ -extern int __pthread_once (pthread_once_t *__once_control, - void (*__init_routine) (void)) __THROW; extern int pthread_once (pthread_once_t *__once_control, void (*__init_routine) (void)) __THROW; @@ -533,9 +515,6 @@ extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *__buff first called before FORK), and the PARENT and CHILD handlers are called in FIFO (first added, first called). */ -extern int __pthread_atfork (void (*__prepare) (void), - void (*__parent) (void), - void (*__child) (void)) __THROW; extern int pthread_atfork (void (*__prepare) (void), void (*__parent) (void), void (*__child) (void)) __THROW; diff --git a/linuxthreads/weaks.c b/linuxthreads/weaks.c index d142b3d7b1..d6d028f2ec 100644 --- a/linuxthreads/weaks.c +++ b/linuxthreads/weaks.c @@ -1,5 +1,5 @@ /* The weak pthread functions for Linux. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,9 +21,9 @@ #include #include -extern int __pthread_return_0 (void) __THROW; -extern int __pthread_return_1 (void) __THROW; -extern void __pthread_return_void (void) __THROW; +extern int __pthread_return_0 (void); +extern int __pthread_return_1 (void); +extern void __pthread_return_void (void); /* Those are pthread functions which return 0 if successful. */ #if defined HAVE_ELF && defined PIC && defined DO_VERSIONING -- cgit v1.2.3