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

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 32b87b8bab6131ce6c46bed84a5f658b8e59d13b..cec70e1ed159cba6ee06aa58ab07f291a92b165c 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-16  Eric Botcazou  <ebotcazou@adacore.com>
+
+       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 9ff626c8b791d3a3f947bae8368126d66968f4ee..12e7bd8693457339378c402efa691ebcaf738325 100644 (file)
--- 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 */