diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-12 14:29:50 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-12 14:29:50 +0000 |
| commit | b47eb69a53260df58ad2903b430bc328e77cabca (patch) | |
| tree | 722bbe688b0ca9ee8e6404f78dd7615d339f5386 /fixincludes/tests/base | |
| parent | 8d8c2abc14d7727e10fbe5437134f57ecb54cf72 (diff) | |
| download | gcc-b47eb69a53260df58ad2903b430bc328e77cabca.tar.gz | |
* inclhack.def (solaris_cond_init): New fix.
* fixincl.x: Regenerate.
* tests/base/pthread.h [SOLARIS_COND_INIT_CHECK]: New test.
[SOLARIS_MUTEX_INIT_2_CHECK]: Adapt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@162080 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes/tests/base')
| -rw-r--r-- | fixincludes/tests/base/pthread.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fixincludes/tests/base/pthread.h b/fixincludes/tests/base/pthread.h index 069a22bb48b..f08aee40bb6 100644 --- a/fixincludes/tests/base/pthread.h +++ b/fixincludes/tests/base/pthread.h @@ -101,6 +101,16 @@ extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask); #endif /* PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK */ +#if defined( SOLARIS_COND_INIT_CHECK ) +#pragma ident "@(#)pthread.h 1.29 01/07/07 SMI" +#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) +#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, 0} /* = DEFAULTCV */ +#else +#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, {0}} /* = DEFAULTCV */ +#endif +#endif /* SOLARIS_COND_INIT_CHECK */ + + #if defined( SOLARIS_MUTEX_INIT_2_CHECK ) #ident "@(#)pthread.h 1.26 98/04/12 SMI" #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) @@ -109,9 +119,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}, 0} /* DEFAULTCV */ +#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, 0} /* DEFAULTCV */ #else -#define PTHREAD_COND_INITIALIZER {{{0}, 0}, {0}} /* DEFAULTCV */ +#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, {0}} /* DEFAULTCV */ #endif #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) #define PTHREAD_MUTEX_INITIALIZER /* = DEFAULTMUTEX */ \ |