PR libgcj/31084

[pf3gnuchains/gcc-fork.git] / libjava / include / boehm-gc.h

diff --git a/libjava/include/boehm-gc.h b/libjava/include/boehm-gc.h
index fa2623b..ed8ac6a 100644 (file)
--- a/libjava/include/boehm-gc.h
+++ b/libjava/include/boehm-gc.h
@@ -1,7 +1,7 @@
 // -*- c++ -*-
 // boehm-gc.h - Defines for Boehm collector.
 
-/* Copyright (C) 1998, 1999, 2002  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2002, 2004, 2006, 2007  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -12,13 +12,14 @@ details.  */
 #ifndef __JV_BOEHM_GC__
 #define __JV_BOEHM_GC__
 
-#define JV_MARKOBJ_DECL void *_Jv_MarkObj (void *, void *, void *, void *)
-#define JV_MARKARRAY_DECL void *_Jv_MarkArray (void *, void *, void *, void *)
+#define JV_MARKOBJ_DECL void *::_Jv_MarkObj (void *, void *, void *, void *)
+#define JV_MARKARRAY_DECL void *::_Jv_MarkArray (void *, void *, void *, void *)
 
 extern "C"
 {
-  JV_MARKOBJ_DECL;
-  JV_MARKARRAY_DECL;
+  void *_Jv_MarkObj (void *, void *, void *, void *);
+  void *_Jv_MarkArray (void *, void *, void *, void *);
+  void _Jv_RegisterLibForGc (const void *);
 }
 
 // Enough stuff to inline _Jv_AllocObj.  Ugly.
@@ -26,7 +27,7 @@ extern "C"
 #include <java/lang/Class.h>
 #include <string.h>
 
-#include <gc_config.h>
+#include <gc_ext_config.h> // for THREAD_LOCAL_ALLOC
 
 extern "C" void * GC_gcj_malloc(size_t, void *);
 extern "C" void * GC_malloc_atomic(size_t);
@@ -79,7 +80,19 @@ _Jv_AllocPtrFreeObj (jsize size, jclass klass);
 
 #endif /* LIBGCJ_GC_DEBUG */
 
+void _Jv_GCAttachThread ();
+
+void _Jv_GCDetachThread ();
+
 // _Jv_AllocBytes (jsize size) should go here, too.  But clients don't
 // usually include this header.
 
+// Suspend the given thread. This includes suspending the calling thread.
+extern "C" void _Jv_SuspendThread (_Jv_Thread_t *);
+
+// Resume a suspended thread.
+extern "C" void _Jv_ResumeThread (_Jv_Thread_t *);
+
+// Is the given thread suspended?
+extern "C" int _Jv_IsThreadSuspended (_Jv_Thread_t *);
 #endif /* __JV_BOEHM_GC__ */