Merge glitch apparently.
Tested on i586-suse-linux, applied on the 4.4 branch as obvious.
2011-04-16 Eric Botcazou <ebotca...@adacore.com>
PR other/48639
* tests/base/pthread.h [IRIX_PTHREAD_INIT_CHECK]: Move around.
--
Eric Botcazou
Index: tests/base/pthread.h
===================================================================
--- tests/base/pthread.h (revision 172588)
+++ tests/base/pthread.h (working copy)
@@ -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 */
