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.

From-SVN: r185699

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 63a94be252abecf0848206fa6b20b9d88667d8bf..28c31d6397cfde0516b70e270ceefdd34ddd85e9 100644 (file)
--- 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 dc719166049e7eb3ac431ac0a6ea942aa9cbe366..97200c4720f05844b86f9eb2497d1488e0a06858 100644 (file)
--- 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 */    \