summaryrefslogtreecommitdiff
path: root/libpthread/linuxthreads/sysdeps/pthread
diff options
context:
space:
mode:
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/pthread')
-rw-r--r--libpthread/linuxthreads/sysdeps/pthread/list.h8
-rw-r--r--libpthread/linuxthreads/sysdeps/pthread/posix-timer.h18
-rw-r--r--libpthread/linuxthreads/sysdeps/pthread/timer_routines.c20
3 files changed, 23 insertions, 23 deletions
diff --git a/libpthread/linuxthreads/sysdeps/pthread/list.h b/libpthread/linuxthreads/sysdeps/pthread/list.h
index 43186a2d5..75decfbb7 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/list.h
+++ b/libpthread/linuxthreads/sysdeps/pthread/list.h
@@ -43,7 +43,7 @@ typedef struct list_head
/* Add new element at the head of the list. */
-static inline void
+static __inline__ void
list_add (list_t *newp, list_t *head)
{
head->next->prev = newp;
@@ -54,7 +54,7 @@ list_add (list_t *newp, list_t *head)
/* Add new element at the tail of the list. */
-static inline void
+static __inline__ void
list_add_tail (list_t *newp, list_t *head)
{
head->prev->next = newp;
@@ -65,7 +65,7 @@ list_add_tail (list_t *newp, list_t *head)
/* Remove element from list. */
-static inline void
+static __inline__ void
list_del (list_t *elem)
{
elem->next->prev = elem->prev;
@@ -74,7 +74,7 @@ list_del (list_t *elem)
/* Join two lists. */
-static inline void
+static __inline__ void
list_splice (list_t *add, list_t *head)
{
/* Do nothing if the list which gets added is empty. */
diff --git a/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h b/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h
index 1b0a2b65e..5486f7d6a 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h
+++ b/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h
@@ -88,7 +88,7 @@ extern struct thread_node __timer_signal_thread_rclk;
/* Return pointer to timer structure corresponding to ID. */
-static inline struct timer_node *
+static __inline__ struct timer_node *
timer_id2ptr (timer_t timerid)
{
if (timerid >= 0 && timerid < TIMER_MAX)
@@ -98,14 +98,14 @@ timer_id2ptr (timer_t timerid)
}
/* Return ID of TIMER. */
-static inline int
+static __inline__ int
timer_ptr2id (struct timer_node *timer)
{
return timer - __timer_array;
}
/* Check whether timer is valid; global mutex must be held. */
-static inline int
+static __inline__ int
timer_valid (struct timer_node *timer)
{
return timer && timer->inuse == TIMER_INUSE;
@@ -114,13 +114,13 @@ timer_valid (struct timer_node *timer)
/* Timer refcount functions; need global mutex. */
extern void __timer_dealloc (struct timer_node *timer);
-static inline void
+static __inline__ void
timer_addref (struct timer_node *timer)
{
timer->refcount++;
}
-static inline void
+static __inline__ void
timer_delref (struct timer_node *timer)
{
if (--timer->refcount == 0)
@@ -128,7 +128,7 @@ timer_delref (struct timer_node *timer)
}
/* Timespec helper routines. */
-static inline int
+static __inline__ int
timespec_compare (const struct timespec *left, const struct timespec *right)
{
if (left->tv_sec < right->tv_sec)
@@ -144,7 +144,7 @@ timespec_compare (const struct timespec *left, const struct timespec *right)
return 0;
}
-static inline void
+static __inline__ void
timespec_add (struct timespec *sum, const struct timespec *left,
const struct timespec *right)
{
@@ -158,7 +158,7 @@ timespec_add (struct timespec *sum, const struct timespec *left,
}
}
-static inline void
+static __inline__ void
timespec_sub (struct timespec *diff, const struct timespec *left,
const struct timespec *right)
{
@@ -174,7 +174,7 @@ timespec_sub (struct timespec *diff, const struct timespec *left,
/* We need one of the list functions in the other modules. */
-static inline void
+static __inline__ void
list_unlink_ip (struct list_links *list)
{
struct list_links *lnext = list->next, *lprev = list->prev;
diff --git a/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c b/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c
index 3877b86fb..25b4630ee 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c
+++ b/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c
@@ -65,13 +65,13 @@ extern int __syscall_rt_sigqueueinfo (int, int, siginfo_t *);
/* List handling functions. */
-static inline void
+static __inline__ void
list_init (struct list_links *list)
{
list->next = list->prev = list;
}
-static inline void
+static __inline__ void
list_append (struct list_links *list, struct list_links *newp)
{
newp->prev = list->prev;
@@ -80,7 +80,7 @@ list_append (struct list_links *list, struct list_links *newp)
list->prev = newp;
}
-static inline void
+static __inline__ void
list_insbefore (struct list_links *list, struct list_links *newp)
{
list_append (list, newp);
@@ -91,7 +91,7 @@ list_insbefore (struct list_links *list, struct list_links *newp)
* is already unlinked is disastrous rather than a noop.
*/
-static inline void
+static __inline__ void
list_unlink (struct list_links *list)
{
struct list_links *lnext = list->next, *lprev = list->prev;
@@ -100,25 +100,25 @@ list_unlink (struct list_links *list)
lprev->next = lnext;
}
-static inline struct list_links *
+static __inline__ struct list_links *
list_first (struct list_links *list)
{
return list->next;
}
-static inline struct list_links *
+static __inline__ struct list_links *
list_null (struct list_links *list)
{
return list;
}
-static inline struct list_links *
+static __inline__ struct list_links *
list_next (struct list_links *list)
{
return list->next;
}
-static inline int
+static __inline__ int
list_isempty (struct list_links *list)
{
return list->next == list;
@@ -126,14 +126,14 @@ list_isempty (struct list_links *list)
/* Functions build on top of the list functions. */
-static inline struct thread_node *
+static __inline__ struct thread_node *
thread_links2ptr (struct list_links *list)
{
return (struct thread_node *) ((char *) list
- offsetof (struct thread_node, links));
}
-static inline struct timer_node *
+static __inline__ struct timer_node *
timer_links2ptr (struct list_links *list)
{
return (struct timer_node *) ((char *) list