2008-06-27 Samuel Thibault <samuel.thibault@ens-lyon.org>

	* include/pthread/pthread.h: Do not define __need_clockid_t, include
	<time.h>, and define clockid_t if __clockid_defined is not defined.
	Include <pthread/pthreadtypes.h>
	(pthread_equal): New extern inline.
	(pthread_cleanup_push, pthread_cleanup_pop): New macros.
	(__pthread_process_shared, __pthread_inheritsched,
	__pthread_contentionscope, __pthread_detachstate,
	__pthread_mutex_protocol, __pthread_mutex_type,
	pthread_attr_t, pthread_mutex_attr_t, pthread_mutex_t,
	pthread_condattr_t, pthread_cond_t, pthread_spinlock_t,
	pthread_rwlockattr_t, pthread_rwlock_t, pthread_barrierattr_t,
	pthread_barrier_t, pthread_key_t, pthread_once_t): Move enums and
	typedefs to...
	* include/pthread/pthreadtypes.h: ... new file.
	* sysdeps/generic/bits/cancelation.h (pthread_cleanup_push): Rename
	macro to __pthread_cleanup_push.
	(pthread_cleanup_pop): Rename macro to __pthread_cleanup_pop.
	* sysdeps/generic/bits/barrier-attr.h (__pthread_process_shared):
	Forward-declare enum.
	* sysdeps/generic/bits/condition-attr.h (__pthread_process_shared):
	Likewise.
	* sysdeps/generic/bits/mutex-attr.h (__pthread_mutex_protocol,
	__pthread_process_shared, __pthread_mutex_type):
	Likewise.
	* sysdeps/generic/bits/rwlock-attr.h (__pthread_process_shared):
	Likewise.
	* sysdeps/generic/bits/thread-attr.h (__pthread_detachstate,
	__pthread_inheritsched, __pthread_contentionscope):
	Likewise.
	* sysdeps/generic/bits/pthread.h (pthread_t): Rename type to
	__pthread_t.
	(pthread_equal): Rename to __pthread_equal.

1 files changed, 136 insertions, 0 deletions

diff --git a/include/pthread/pthreadtypes.h b/include/pthread/pthreadtypes.h
new file mode 100644
index 0000000..690f1e4
--- /dev/null
+++ b/include/pthread/pthreadtypes.h
@@ -0,0 +1,136 @@
+/* Copyright (C) 2000, 2002, 2005 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/*
+ *	POSIX Threads Extension: ???			<pthreadtypes.h>
+ */
+
+#ifndef _PTHREADTYPES_H
+#define _PTHREADTYPES_H	1
+
+#include <features.h>
+
+#define __need_clockid_t
+#include <time.h>
+
+/* If we are in a mode where clockid_t is not automatically defined
+   and another header has already included <time.h> then defining
+   __need_clockid_t was not enough.  */
+#ifndef __clockid_t_defined
+# define __clockid_t_defined    1
+# include <bits/types.h>
+/* Clock ID used in clock and timer functions.  */
+typedef __clockid_t clockid_t;
+#endif
+
+__BEGIN_DECLS
+
+#include <bits/pthread.h>
+typedef __pthread_t pthread_t;
+
+/* Possible values for the process shared attribute.  */
+enum __pthread_process_shared
+  {
+    __PTHREAD_PROCESS_PRIVATE = 0,
+    __PTHREAD_PROCESS_SHARED
+  };
+
+/* Possible values for the inheritsched attribute.  */
+enum __pthread_inheritsched
+  {
+    __PTHREAD_EXPLICIT_SCHED = 0,
+    __PTHREAD_INHERIT_SCHED
+  };
+
+/* Possible values for the `contentionscope' attribute.  */
+enum __pthread_contentionscope
+  {
+    __PTHREAD_SCOPE_SYSTEM = 0,
+    __PTHREAD_SCOPE_PROCESS,
+  };
+
+/* Possible values for the `detachstate' attribute.  */
+enum __pthread_detachstate
+  {
+    __PTHREAD_CREATE_JOINABLE = 0,
+    __PTHREAD_CREATE_DETACHED
+  };
+
+#include <bits/thread-attr.h>
+typedef struct __pthread_attr pthread_attr_t;
+
+enum __pthread_mutex_protocol
+  {
+    __PTHREAD_PRIO_NONE= 0,
+    __PTHREAD_PRIO_INHERIT,
+    __PTHREAD_PRIO_PROTECT
+  };
+
+enum __pthread_mutex_type
+  {
+    __PTHREAD_MUTEX_TIMED,
+    __PTHREAD_MUTEX_ERRORCHECK,
+    __PTHREAD_MUTEX_RECURSIVE
+  };
+
+#include <bits/mutex-attr.h>
+typedef struct __pthread_mutexattr pthread_mutexattr_t;
+
+#include <bits/mutex.h>
+typedef struct __pthread_mutex pthread_mutex_t;
+
+#include <bits/condition-attr.h>
+typedef struct __pthread_condattr pthread_condattr_t;
+
+#include <bits/condition.h>
+typedef struct __pthread_cond pthread_cond_t;
+
+#ifdef __USE_XOPEN2K
+# include <bits/spin-lock.h>
+typedef __pthread_spinlock_t pthread_spinlock_t;
+#endif /* XPG6.  */
+
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K
+
+#include <bits/rwlock-attr.h>
+typedef struct __pthread_rwlockattr pthread_rwlockattr_t;
+
+#include <bits/rwlock.h>
+typedef struct __pthread_rwlock pthread_rwlock_t;
+
+#endif /* __USE_UNIX98 || __USE_XOPEN2K */
+
+#ifdef __USE_XOPEN2K
+
+#include <bits/barrier-attr.h>
+typedef struct __pthread_barrierattr pthread_barrierattr_t;
+
+#include <bits/barrier.h>
+typedef struct __pthread_barrier pthread_barrier_t;
+
+#endif /* __USE_XOPEN2K */
+
+#include <bits/thread-specific.h>
+typedef __pthread_key pthread_key_t;
+
+#include <bits/once.h>
+typedef struct __pthread_once pthread_once_t;
+
+__END_DECLS
+
+#endif /* pthreadtypes.h */