javaop.h (WORD_TO_FLOAT): Use `inline' unconditionally.

	* javaop.h (WORD_TO_FLOAT): Use `inline' unconditionally.
	(WORDS_TO_LONG): Likewise.
	(WORDS_TO_DOUBLE): Likewise.

From-SVN: r29593

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 1d9ca39a58aecbf61515586a638ee06593cbb24b..6bfe425d2c1b340cccc0d6df0743698c6db5ef49 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+1999-09-22  Tom Tromey  <tromey@cygnus.com>
+
+       * javaop.h (WORD_TO_FLOAT): Use `inline' unconditionally.
+       (WORDS_TO_LONG): Likewise.
+       (WORDS_TO_DOUBLE): Likewise.
+
 1999-09-15  Andreas Schwab  <schwab@suse.de>
 
        * Makefile.in (parse.o): Depend on $(JAVA_TREE_H).

diff --git a/gcc/java/javaop.h b/gcc/java/javaop.h
index 5f72e6a7f093c6ca0797f9923665c3a0a406076d..cce0a61ea496927bd58c0a541db2d2c705cec381 100644 (file)
--- a/gcc/java/javaop.h
+++ b/gcc/java/javaop.h
@@ -102,20 +102,14 @@ union Word {
          | (BCODE[PC-2] << 8) | (BCODE[PC-1]))))
 #endif
 
-#ifdef __GNUC__
-__inline
-#endif
-static jfloat
+static inline jfloat
 WORD_TO_FLOAT(jword w)
 { union Word wu;
   wu.i = w;
   return wu.f;
 } 
 
-#ifdef __GNUC__
-__inline
-#endif
-static jlong
+static inline jlong
 WORDS_TO_LONG(jword hi, jword lo)
 {
   return ((jlong) hi << 32) | ((jlong)lo & (((jlong)1 << 32) -1));
@@ -127,10 +121,7 @@ union DWord {
   jword w[2];
 };
 
-#ifdef __GNUC__
-__inline
-#endif
-static jdouble
+static inline jdouble
 WORDS_TO_DOUBLE(jword hi, jword lo)
 { union DWord wu;
   wu.l = WORDS_TO_LONG(hi, lo);