From: jvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 18 Oct 2008 05:23:47 +0000 (+0000)
Subject: 2008-10-17  Jerry DeLisle  <jvdelisle@gcc.gnu.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9f0f963eadefadb654446f7a25caf84967ffa86;p=thirdparty%2Fgcc.git

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 049f0dd874a0..f6da2ce094f3 100644
--- 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 710224de21de..ec37be37a81e 100644
--- 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 0ee8f3560c43..73a6ed14a1b2 100644
--- 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);\
 \