2010-02-23 Jeff Johnston <jjohnstn@redhat.com>

* libc/include/sys/types.h: Fix __XMK__ sectioning and remove
        redundant code section for __XMK__.
This commit is contained in:
Jeff Johnston 2010-02-23 23:13:20 +00:00
parent a2036998b1
commit 84f66e46b9
2 changed files with 7 additions and 57 deletions

View File

@ -1,3 +1,8 @@
2010-02-23 Jeff Johnston <jjohnstn@redhat.com>
* libc/include/sys/types.h: Fix __XMK__ sectioning and remove
redundant code section for __XMK__.
2010-02-22 Corinna Vinschen <corinna@vinschen.de>
* libc/include/langinfo.h (_NL_TIME_DATE_FMT): Define new nl_item

View File

@ -349,7 +349,6 @@ typedef struct {
int inheritsched;
int schedpolicy;
struct sched_param schedparam;
#endif /* !defined(__XMK__) */
/* P1003.4b/D8, p. 54 adds cputime_clock_allowed attribute. */
#if defined(_POSIX_THREAD_CPUTIME)
@ -359,6 +358,8 @@ typedef struct {
} pthread_attr_t;
#endif /* !defined(__XMK__) */
#if defined(_POSIX_THREAD_PROCESS_SHARED)
/* NOTE: P1003.1c/D10, p. 81 defines following values for process_shared. */
@ -396,62 +397,6 @@ typedef struct {
int type;
} pthread_mutexattr_t;
#if defined(__XMK__)
/* The following defines are part of the X/Open System Interface (XSI). */
/* This type of mutex does not detect deadlock. A thread attempting to
* relock this mutex without first unlocking it shall deadlock. Attempting
* to unlock a mutex locked by a different thread results in undefined
* behavior. Attempting to unlock an unlocked mutex results in undefined
* behavior.
*/
#define PTHREAD_MUTEX_NORMAL 1
/*
* This type of mutex provides error checking. A thread attempting to
* relock this mutex without first unlocking it shall return with an error.
* A thread attempting to unlock a mutex which another thread has locked
* shall return with an error. A thread attempting to unlock an unlocked
* mutex shall return with an error.
*/
#define PTHREAD_MUTEX_ERRORCHECK 2
/* A thread attempting to relock this mutex without first unlocking it
* shall succeed in locking the mutex. The relocking deadlock which can
* occur with mutexes of type PTHREAD_MUTEX_NORMAL cannot occur with this
* type of mutex. Multiple locks of this mutex shall require the same
* number of unlocks to release the mutex before another thread can
* acquire the mutex. A thread attempting to unlock a mutex which another
* thread has locked shall return with an error. A thread attempting to
* unlock an unlocked mutex shall return with an error.
*/
#define PTHREAD_MUTEX_RECURSIVE 3
/* Attempting to recursively lock a mutex of this type results in
* undefined behavior. Attempting to unlock a mutex of this type which was
* not locked by the calling thread results in undefined behavior.
* Attempting to unlock a mutex of this type which is not locked results
* in undefined behavior. An implementation may map this mutex to one of
* the other mutex types.
*/
#define PTHREAD_MUTEX_DEFAULT 4
typedef struct pthread_attr_s {
int contentionscope;
struct sched_param schedparam;
int detachstate;
void *stackaddr;
size_t stacksize;
} pthread_attr_t;
#define PTHREAD_STACK_MIN 200
#endif /* defined(__XMK__) */
typedef struct {
int type;
} pthread_mutexattr_t;
#else /* !defined(__XMK__) */
typedef __uint32_t pthread_mutex_t; /* identify a mutex */