* Fix PR other/48639
@ 2011-04-16 20:21 Eric Botcazou
0 siblings, 0 replies; only message in thread
From: Eric Botcazou @ 2011-04-16 20:21 UTC (permalink / raw)
To: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
Merge glitch apparently.
Tested on i586-suse-linux, applied on the 4.4 branch as obvious.
2011-04-16 Eric Botcazou <ebotcazou@adacore.com>
PR other/48639
* tests/base/pthread.h [IRIX_PTHREAD_INIT_CHECK]: Move around.
--
Eric Botcazou
[-- Attachment #2: p.diff --]
[-- Type: text/x-diff, Size: 857 bytes --]
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 */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-04-16 19:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-16 20:21 Fix PR other/48639 Eric Botcazou
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).