diff options
| -rw-r--r-- | fixincludes/ChangeLog | 6 | ||||
| -rw-r--r-- | fixincludes/tests/base/pthread.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 63a94be252a..28c31d6397c 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,9 @@ +2012-03-22 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + 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 <gingold@adacore.com> * README (EXAMPLES OF FIXES): Update. diff --git a/fixincludes/tests/base/pthread.h b/fixincludes/tests/base/pthread.h index dc719166049..97200c4720f 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 */ \ |