From dd7d7e3f138d1835d153c316f3d771e40dc641ba Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Thu, 31 Jul 2008 15:21:24 +0000 Subject: Synch with trunk at rev 22997. Basically trailing whitespaces removal, fix non standard keywords asm -> __asm__ inline -> __inline__ and some minor changes on trunk. Signed-off-by: Carmelo Amoroso --- .../linuxthreads/sysdeps/unix/sysv/linux/hppa/malloc-machine.h | 6 +++--- libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h | 2 +- libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c | 2 +- libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libpthread/linuxthreads/sysdeps/unix/sysv') diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/malloc-machine.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/malloc-machine.h index 817cf5922..6a53da2a0 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/malloc-machine.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/malloc-machine.h @@ -1,9 +1,9 @@ -/* HP-PARISC macro definitions for mutexes, thread-specific data +/* HP-PARISC macro definitions for mutexes, thread-specific data and parameters for malloc. Copyright (C) 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Carlos O'Donell , 2003. - + The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -43,7 +43,7 @@ __libc_lock_define (typedef, mutex_t) # define mutex_unlock(m) \ __libc_maybe_call (__pthread_mutex_unlock, (m), \ (((m)->__m_lock.__spinlock = __LT_SPINLOCK_INIT), (*(int *)(m))) ) - + /* This is defined by newer gcc version unique for each module. */ extern void *__dso_handle __attribute__ ((__weak__)); diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h index 2c0cbe99a..5e2f43cda 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h @@ -17,7 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -static inline int +static __inline__ int is_smp_system (void) { return 0; diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c index fdec09455..3432125bb 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c @@ -31,7 +31,7 @@ extern int __syscall_rt_sigtimedwait (const sigset_t *__unbounded, siginfo_t *__ /* Return any pending signal or wait for one for the given time. */ -static inline int +static __inline__ int do_sigwait (const sigset_t *set, int *sig) { int ret; diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h index 81289294b..9ab75e8e6 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h @@ -22,7 +22,7 @@ /* Test whether the machine has more than one processor. This is not the best test but good enough. More complicated tests would require `malloc' which is not available at that time. */ -static inline int +static __inline__ int is_smp_system (void) { static const int sysctl_args[] = { CTL_KERN, KERN_VERSION }; -- cgit v1.2.3