diff options
| author | Diego Novillo <dnovillo@redhat.com> | 2003-07-23 17:03:31 +0000 |
|---|---|---|
| committer | Diego Novillo <dnovillo@redhat.com> | 2003-07-23 17:03:31 +0000 |
| commit | 2b56f4a2a4bf1437fe0e381f17b9d9e6d394d3f0 (patch) | |
| tree | 07f55fdf8b411c9cb03cad72e957a303ed539089 /libjava/gcj | |
| parent | 2a8e080a82b359637fc50ba9e26e6f8265d80826 (diff) | |
Mainline merge as of 2003-07-22.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@69712 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gcj')
| -rw-r--r-- | libjava/gcj/array.h | 4 | ||||
| -rw-r--r-- | libjava/gcj/cni.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libjava/gcj/array.h b/libjava/gcj/array.h index 33ea038df93..4f134f33c5c 100644 --- a/libjava/gcj/array.h +++ b/libjava/gcj/array.h @@ -71,7 +71,9 @@ typedef JArray<jstring> *jstringArray; extern java::lang::Class _Jv_byteClass, _Jv_shortClass, _Jv_intClass, _Jv_longClass, _Jv_booleanClass, _Jv_charClass, _Jv_floatClass, _Jv_doubleClass, _Jv_voidClass; -#define JvPrimClass(TYPE) (& _Jv_##TYPE##Class) +/* The definition of this macro cannot be enclosed in parentheses + because "JvPrimClass(x)" is used as a template argument. */ +#define JvPrimClass(TYPE) & _Jv_##TYPE##Class extern "C" jobjectArray _Jv_NewObjectArray(jsize length, jclass, jobject init); extern "C" jobject _Jv_NewPrimArray (jclass eltype, jint count); diff --git a/libjava/gcj/cni.h b/libjava/gcj/cni.h index 08b55c3c7f2..3790dc4d564 100644 --- a/libjava/gcj/cni.h +++ b/libjava/gcj/cni.h @@ -1,5 +1,5 @@ // gcj/cni.h -*- c++ -*- -// This file describes the Cygnus Native Interface, CNI. +// This file describes the Compiled Native Interface, CNI. // It provides a nicer interface to many of the things in gcj/javaprims.h. /* Copyright (C) 1998, 1999, 2002 Free Software Foundation |