diff options
| author | Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> | 2004-11-18 05:37:13 +0000 |
|---|---|---|
| committer | Kriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org> | 2004-11-18 05:37:13 +0000 |
| commit | 21a0c6e02e954af433961f306e18cbc96f31cab5 (patch) | |
| tree | c2de80f38c947fa654ee6ce1d35fb02b560f5c26 /libjava/include | |
| parent | 7915fbaa19b94cfe53f288d4d5d4f9350136a13e (diff) | |
| download | gcc-21a0c6e02e954af433961f306e18cbc96f31cab5.zip gcc-21a0c6e02e954af433961f306e18cbc96f31cab5.tar.gz gcc-21a0c6e02e954af433961f306e18cbc96f31cab5.tar.bz2 | |
Makefile.am: Correct friend function declaration.
* 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.
From-SVN: r90849
Diffstat (limited to 'libjava/include')
| -rw-r--r-- | libjava/include/boehm-gc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libjava/include/boehm-gc.h b/libjava/include/boehm-gc.h index fa2623b..61e007f 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. |