Commit ea517ca5 by Tom Tromey Committed by Tom Tromey

natDouble.cc (toString): Added parens.

	* java/lang/natDouble.cc (toString): Added parens.
	* gnu/gcj/io/shs.h (PROTO): Define.
	* link.cc (resolve_pool_entry): Added missing braces.

From-SVN: r120652
parent 26b53f80
2007-01-10 Tom Tromey <tromey@redhat.com>
* java/lang/natDouble.cc (toString): Added parens.
* gnu/gcj/io/shs.h (PROTO): Define.
* link.cc (resolve_pool_entry): Added missing braces.
2007-01-10 H.J. Lu <hongjiu.lu@intel.com> 2007-01-10 H.J. Lu <hongjiu.lu@intel.com>
PR libgcj/30424 PR libgcj/30424
......
...@@ -31,6 +31,8 @@ typedef unsigned int uint32_t __attribute__((mode(SI))); ...@@ -31,6 +31,8 @@ typedef unsigned int uint32_t __attribute__((mode(SI)));
# endif # endif
#endif #endif
#define PROTO
/* The SHS block size and message digest sizes, in bytes */ /* The SHS block size and message digest sizes, in bytes */
#define SHS_BLOCKSIZE 64 #define SHS_BLOCKSIZE 64
......
// natDouble.cc - Implementation of java.lang.VMDouble native methods. // natDouble.cc - Implementation of java.lang.VMDouble native methods.
/* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006 Free Software Foundation /* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006, 2007 Free Software Foundation
This file is part of libgcj. This file is part of libgcj.
...@@ -87,7 +87,7 @@ java::lang::VMDouble::toString(jdouble value, jboolean isFloat) ...@@ -87,7 +87,7 @@ java::lang::VMDouble::toString(jdouble value, jboolean isFloat)
if (sign) if (sign)
*d++ = '-'; *d++ = '-';
if (value >= 1e-3 && value < 1e7 || value == 0) if ((value >= 1e-3 && value < 1e7) || value == 0)
{ {
if (decpt <= 0) if (decpt <= 0)
*d++ = '0'; *d++ = '0';
......
// link.cc - Code for linking and resolving classes and pool entries. // link.cc - Code for linking and resolving classes and pool entries.
/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation /* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
This file is part of libgcj. This file is part of libgcj.
...@@ -408,6 +408,7 @@ _Jv_Linker::resolve_pool_entry (jclass klass, int index, bool lazy) ...@@ -408,6 +408,7 @@ _Jv_Linker::resolve_pool_entry (jclass klass, int index, bool lazy)
// with it should just throw a NoClassDefFoundError with the class' // with it should just throw a NoClassDefFoundError with the class'
// name. // name.
if (! found) if (! found)
{
if (lazy) if (lazy)
{ {
found = _Jv_NewClass(name, NULL, NULL); found = _Jv_NewClass(name, NULL, NULL);
...@@ -418,6 +419,7 @@ _Jv_Linker::resolve_pool_entry (jclass klass, int index, bool lazy) ...@@ -418,6 +419,7 @@ _Jv_Linker::resolve_pool_entry (jclass klass, int index, bool lazy)
} }
else else
throw new java::lang::NoClassDefFoundError (name->toString()); throw new java::lang::NoClassDefFoundError (name->toString());
}
// Check accessibility, but first strip array types as // Check accessibility, but first strip array types as
// _Jv_ClassNameSamePackage can't handle arrays. // _Jv_ClassNameSamePackage can't handle arrays.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment