Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/ChangeLog,v
retrieving revision 1.201
diff -u -r1.201 ChangeLog
--- ChangeLog	23 Aug 2004 15:07:00 -0000	1.201
+++ ChangeLog	23 Aug 2004 21:38:37 -0000
@@ -1,3 +1,8 @@
+2004-08-23  Hans Boehm  <Hans.Boehm@hp.com>
+
+	* aix_irix_threads.c: Move _THREADS checks after gc_priv.h include.
+	* backgraph.c, include/private/gc_pmark.h: Always include gc.h.
+
 2004-08-23  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* win32_threads.c: Move GC_WIN32_THREADS check after gc_priv.h include.
Index: aix_irix_threads.c
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/aix_irix_threads.c,v
retrieving revision 1.2
diff -u -r1.2 aix_irix_threads.c
--- aix_irix_threads.c	13 Aug 2004 23:05:29 -0000	1.2
+++ aix_irix_threads.c	23 Aug 2004 21:38:37 -0000
@@ -26,9 +26,10 @@
  * as a base instead.
  */
 
+# include "private/gc_priv.h"
+
 # if defined(GC_IRIX_THREADS) || defined(GC_AIX_THREADS)
 
-# include "private/gc_priv.h"
 # include <pthread.h>
 # include <assert.h>
 # include <semaphore.h>
Index: backgraph.c
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/backgraph.c,v
retrieving revision 1.2
diff -u -r1.2 backgraph.c
--- backgraph.c	28 Jul 2003 04:18:20 -0000	1.2
+++ backgraph.c	23 Aug 2004 21:38:37 -0000
@@ -24,6 +24,8 @@
  * a growing space leak.
  */
 
+#include "gc.h"	/* For configuration information. */
+
 #ifdef MAKE_BACK_GRAPH
 
 #define MAX_IN	10	/* Maximum in-degree we handle directly */
Index: include/private/gc_pmark.h
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/include/private/gc_pmark.h,v
retrieving revision 1.7
diff -u -r1.7 gc_pmark.h
--- include/private/gc_pmark.h	13 Aug 2004 23:05:33 -0000	1.7
+++ include/private/gc_pmark.h	23 Aug 2004 21:38:37 -0000
@@ -25,6 +25,8 @@
 #ifndef GC_PMARK_H
 # define GC_PMARK_H
 
+# include "gc.h"	/* For configuration */
+
 # if defined(KEEP_BACK_PTRS) || defined(PRINT_BLACK_LIST)
 #   include "dbg_mlc.h"
 # endif