diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 1999-02-01 07:00:40 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 1999-02-01 07:00:40 +0000 |
| commit | 9caaf519d8e51366ccd4183184d2fa3f7ed73b84 (patch) | |
| tree | 570b8b7b27d55e193909beb5ec53c37b7769cbd4 /gcc/java/javaop.h | |
| parent | 8a68e183019a0a1a27c0a697d7a44bb13522eb99 (diff) | |
| download | gcc-9caaf519d8e51366ccd4183184d2fa3f7ed73b84.zip gcc-9caaf519d8e51366ccd4183184d2fa3f7ed73b84.tar.gz gcc-9caaf519d8e51366ccd4183184d2fa3f7ed73b84.tar.bz2 | |
Makefile.in (gjavah.o): Depend on $(CONFIG_H) and system.h.
* Makefile.in (gjavah.o): Depend on $(CONFIG_H) and system.h.
* gjavah.c: Include config.h and system.h.
* javaop.h (inline): Don't define, its handled by system.h.
(WORD_TO_FLOAT, WORDS_TO_LONG, WORDS_TO_DOUBLE): Change these
from `inline' to `static inline'.
* jcf.h (inline): Don't define, its handled by system.h.
* lex.c (inline): Likewise.
From-SVN: r24952
Diffstat (limited to 'gcc/java/javaop.h')
| -rw-r--r-- | gcc/java/javaop.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gcc/java/javaop.h b/gcc/java/javaop.h index b00fd0a..cce0a61 100644 --- a/gcc/java/javaop.h +++ b/gcc/java/javaop.h @@ -1,6 +1,6 @@ /* Utility macros to handle Java(TM) byte codes. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 1998, 1999 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -82,10 +82,6 @@ union Word { #define jword uint32 #endif -#if !defined(inline) && !defined(__GC__) && !defined(__cplusplus) -#define inline static -#endif - #ifndef IMMEDIATE_u1 #define IMMEDIATE_u1 (PC++, CHECK_PC_IN_RANGE(PC), BCODE[PC-1]) #endif @@ -106,14 +102,14 @@ union Word { | (BCODE[PC-2] << 8) | (BCODE[PC-1])))) #endif -inline jfloat +static inline jfloat WORD_TO_FLOAT(jword w) { union Word wu; wu.i = w; return wu.f; } -inline jlong +static inline jlong WORDS_TO_LONG(jword hi, jword lo) { return ((jlong) hi << 32) | ((jlong)lo & (((jlong)1 << 32) -1)); @@ -125,7 +121,7 @@ union DWord { jword w[2]; }; -inline jdouble +static inline jdouble WORDS_TO_DOUBLE(jword hi, jword lo) { union DWord wu; wu.l = WORDS_TO_LONG(hi, lo); |