2008-10-17 Jerry DeLisle <jvdelisle@gcc.gnu.org

	PR libfortran/37707
	* io/write_float.def (WRITE_FLOAT): Round to 1.0 correctly.
	* io/io.h (st_parameter_44): Fix id type declaration.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@141207 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 049f0dd874a077055f5707b13447bca013a8b953..f6da2ce094f3cf8b433e9be7f480dde2cdf60946 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-17  Jerry DeLisle  <jvdelisle@gcc.gnu.org
+
+       PR libfortran/37707
+       * io/write_float.def (WRITE_FLOAT): Round to 1.0 correctly.
+       * io/io.h (st_parameter_44): Fix id type declaration.
+
 2008-10-16  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        * io/file_pos.c (unformatted_backspace): Normal case is

diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h
index 710224de21dec0691a152589402d0c35ebbd7b9b..ec37be37a81e152ad7076c6e45133c23f099991f 100644 (file)
--- a/libgfortran/io/io.h
+++ b/libgfortran/io/io.h
@@ -458,7 +458,7 @@ typedef struct st_parameter_43
 
 typedef struct st_parameter_44
 {
-  GFC_IO_INT *id;
+  GFC_INTEGER_4 *id;
   GFC_IO_INT pos;
   CHARACTER1 (asynchronous);
   CHARACTER2 (blank);

diff --git a/libgfortran/io/write_float.def b/libgfortran/io/write_float.def
index 0ee8f3560c4373d914caf8d3862c980826e02c6a..73a6ed14a1b290b74043198294a5dec2ff5deb25 100644 (file)
--- a/libgfortran/io/write_float.def
+++ b/libgfortran/io/write_float.def
@@ -746,7 +746,7 @@ sprintf (buffer, "%+-#" STR(MIN_FIELD_WIDTH) ".*" \
            if (tmp < 0.5)\
              tmp = 0.0;\
            else if (tmp < 1.0)\
-             tmp = tmp + 0.5;\
+             tmp = 1.0;\
          }\
        zero_flag = (tmp == 0.0);\
 \