From 588600ee21c9e9d8359ccb91ede4bf0fe57918f6 Mon Sep 17 00:00:00 2001 From: ro Date: Thu, 22 Mar 2012 16:07:47 +0000 Subject: [PATCH] Fix pthread.h failure (PR other/52626) PR other/52626 * tests/base/pthread.h [SOLARIS_MUTEX_INIT_2_CHECK] (PTHREAD_COND_INITIALIZER): Adapt for solaris_cond_init removal. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185699 138bc75d-0d04-0410-961f-82ee72b054a4 --- fixincludes/ChangeLog | 6 ++++++ fixincludes/tests/base/pthread.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 63a94be..28c31d6 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,9 @@ +2012-03-22 Rainer Orth + + PR other/52626 + * tests/base/pthread.h [SOLARIS_MUTEX_INIT_2_CHECK] + (PTHREAD_COND_INITIALIZER): Adapt for solaris_cond_init removal. + 2012-03-15 Tristan Gingold * README (EXAMPLES OF FIXES): Update. diff --git a/fixincludes/tests/base/pthread.h b/fixincludes/tests/base/pthread.h index dc71916..97200c4 100644 --- a/fixincludes/tests/base/pthread.h +++ b/fixincludes/tests/base/pthread.h @@ -83,9 +83,9 @@ extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask); #define PTHREAD_MUTEX_INITIALIZER {{{0},0}, {{{0}}}, {0}} #endif #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) -#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, 0} /* DEFAULTCV */ +#define PTHREAD_COND_INITIALIZER {{{0}, 0}, 0} /* DEFAULTCV */ #else -#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, {0}} /* DEFAULTCV */ +#define PTHREAD_COND_INITIALIZER {{{0}, 0}, {0}} /* DEFAULTCV */ #endif #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) #define PTHREAD_MUTEX_INITIALIZER /* = DEFAULTMUTEX */ \ -- 2.7.4