X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fpthread.in.h;h=bd8ccfa65476f4ab05f593755f3b1f399679e0fe;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=c05c7c9f5969857594c962d6fc8ce65956e8c2ae;hpb=0ab583c0eaeb5d9c18a6ce0fcdd4f0cd95a581da;p=gnulib.git
diff --git a/lib/pthread.in.h b/lib/pthread.in.h
index c05c7c9f5..bd8ccfa65 100644
--- a/lib/pthread.in.h
+++ b/lib/pthread.in.h
@@ -1,6 +1,6 @@
/* Implement a trivial subset of POSIX 1003.1-2008 pthread.h.
- Copyright (C) 2009-2011 Free Software Foundation, Inc.
+ Copyright (C) 2009-2013 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see . */
/* Written by Paul Eggert and Glen Lenker. */
@@ -33,12 +32,23 @@
#ifndef _@GUARD_PREFIX@_PTHREAD_H_
#define _@GUARD_PREFIX@_PTHREAD_H_
-#include
+#define __need_system_stdlib_h
#include
+#undef __need_system_stdlib_h
+
+#include
#include
#include
#include
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef _GL_PTHREAD_INLINE
+# define _GL_PTHREAD_INLINE _GL_INLINE
+#endif
+
#if ! @HAVE_PTHREAD_T@
# if !GNULIB_defined_pthread_types
typedef int pthread_t;
@@ -111,14 +121,14 @@
know what to do, so that they elicit a compile-time error for
now. */
-static inline int
+_GL_PTHREAD_INLINE int
pthread_cond_destroy (pthread_cond_t *cond)
{
/* COND is never seriously used. */
return 0;
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_cond_init (pthread_cond_t *restrict cond,
pthread_condattr_t const *restrict attr)
{
@@ -126,14 +136,14 @@ pthread_cond_init (pthread_cond_t *restrict cond,
return 0;
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_cond_signal (pthread_cond_t *cond)
{
/* No threads can currently be blocked on COND. */
return 0;
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_cond_wait (pthread_cond_t *restrict cond,
pthread_mutex_t *restrict mutex)
{
@@ -142,7 +152,7 @@ pthread_cond_wait (pthread_cond_t *restrict cond,
return 0;
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_create (pthread_t *restrict thread,
pthread_attr_t const *restrict attr,
void * (*start_routine) (void*), void *restrict arg)
@@ -151,14 +161,14 @@ pthread_create (pthread_t *restrict thread,
return EAGAIN;
}
-static inline void
+_GL_PTHREAD_INLINE void
pthread_exit (void *value)
{
/* There is just one thread, so the process exits. */
exit (0);
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_join (pthread_t thread, void **pvalue)
{
/* Properly-written applications never come here. */
@@ -166,32 +176,32 @@ pthread_join (pthread_t thread, void **pvalue)
return 0;
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_mutexattr_destroy (pthread_mutexattr_t *attr)
{
return 0;
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_mutexattr_init (pthread_mutexattr_t *attr)
{
return 0;
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_mutexattr_settype (pthread_mutexattr_t *attr, int attr_type)
{
return 0;
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_mutex_destroy (pthread_mutex_t *mutex)
{
/* MUTEX is never seriously used. */
return 0;
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_mutex_init (pthread_mutex_t *restrict mutex,
pthread_mutexattr_t const *restrict attr)
{
@@ -199,7 +209,7 @@ pthread_mutex_init (pthread_mutex_t *restrict mutex,
return 0;
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_mutex_lock (pthread_mutex_t *mutex)
{
/* There is only one thread, so it always gets the lock. This
@@ -207,13 +217,13 @@ pthread_mutex_lock (pthread_mutex_t *mutex)
return 0;
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_mutex_trylock (pthread_mutex_t *mutex)
{
return pthread_mutex_lock (mutex);
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_mutex_unlock (pthread_mutex_t *mutex)
{
/* There is only one thread, so it always unlocks successfully.
@@ -235,31 +245,31 @@ pthread_mutex_unlock (pthread_mutex_t *mutex)
typedef pthread_mutex_t pthread_spinlock_t;
-static inline int
+_GL_PTHREAD_INLINE int
pthread_spin_init (pthread_spinlock_t *lock, int pshared)
{
return pthread_mutex_init (lock, NULL);
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_spin_destroy (pthread_spinlock_t *lock)
{
return pthread_mutex_destroy (lock);
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_spin_lock (pthread_spinlock_t *lock)
{
return pthread_mutex_lock (lock);
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_spin_trylock (pthread_spinlock_t *lock)
{
return pthread_mutex_trylock (lock);
}
-static inline int
+_GL_PTHREAD_INLINE int
pthread_spin_unlock (pthread_spinlock_t *lock)
{
return pthread_mutex_unlock (lock);
@@ -270,5 +280,7 @@ pthread_spin_unlock (pthread_spinlock_t *lock)
#endif
+_GL_INLINE_HEADER_END
+
#endif /* _@GUARD_PREFIX@_PTHREAD_H_ */
#endif /* _@GUARD_PREFIX@_PTHREAD_H_ */