From cb940bfca00048e57f698481fb4bdbc4194ad35e Mon Sep 17 00:00:00 2001 From: lerdsuwa Date: Thu, 18 Nov 2004 05:37:13 +0000 Subject: * Makefile.am: Correct friend function declaration. * Makefile.in: Regenerated. * include/boehm-gc.h (JV_MARKOBJ_DECL, JV_MARKARRAY_DECL): Add scope to function names. Declare functions directly. * libjava/java/lang/Class.h (java::lang::Class): Correct friend class declaration. (_Jv_InitClass, _Jv_GetArrayClass): Move definition to global scope. * libjava/java/lang/Class.h (java::lang::Object): Correct friend class declaration. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90849 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/include/boehm-gc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libjava/include') diff --git a/libjava/include/boehm-gc.h b/libjava/include/boehm-gc.h index fa2623b37e1..61e007ff501 100644 --- 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 Free Software Foundation This file is part of libgcj. @@ -12,13 +12,13 @@ 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 *); } // Enough stuff to inline _Jv_AllocObj. Ugly. -- cgit v1.2.3