From c6c031c590b0525aab59f7a2d0a2b64ed4e7c5ed Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sat, 16 Apr 2011 19:35:52 +0000 Subject: [PATCH] re PR other/48639 (pthread.h fixinclude test failure with 4.4.6) PR other/48639 * tests/base/pthread.h [IRIX_PTHREAD_INIT_CHECK]: Move around. From-SVN: r172592 --- fixincludes/ChangeLog | 5 +++++ fixincludes/tests/base/pthread.h | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 32b87b8bab61..cec70e1ed159 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,8 @@ +2011-04-16 Eric Botcazou + + PR other/48639 + * tests/base/pthread.h [IRIX_PTHREAD_INIT_CHECK]: Move around. + 2011-04-16 Release Manager * GCC 4.4.6 released. diff --git a/fixincludes/tests/base/pthread.h b/fixincludes/tests/base/pthread.h index 9ff626c8b791..12e7bd869345 100644 --- a/fixincludes/tests/base/pthread.h +++ b/fixincludes/tests/base/pthread.h @@ -96,11 +96,6 @@ #endif /* GLIBC_MUTEX_INIT_CHECK */ -#if defined( PTHREAD_PAGE_SIZE_CHECK ) -extern int __page_size; -#endif /* PTHREAD_PAGE_SIZE_CHECK */ - - #if defined( IRIX_PTHREAD_INIT_CHECK ) #define PTHREAD_MUTEX_INITIALIZER { { 0 } } #define PTHREAD_COND_INITIALIZER { { 0 } } @@ -108,6 +103,11 @@ extern int __page_size; #endif /* IRIX_PTHREAD_INIT_CHECK */ +#if defined( PTHREAD_PAGE_SIZE_CHECK ) +extern int __page_size; +#endif /* PTHREAD_PAGE_SIZE_CHECK */ + + #if defined( PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK ) extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask); #endif /* PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK */ -- 2.47.2