git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

io.h (st_parameter_dt): Revert 2005-12-10 change to u.pad, fix comment. 

* io/io.h (st_parameter_dt): Revert 2005-12-10 change to
	u.pad, fix comment.
	(check_st_parameter_dt): New compile time assert.

From-SVN: r112850
This commit is contained in:
Jakub Jelinek 2006-04-11 09:15:00 +02:00 committed by Jakub Jelinek
parent cf282d0a4a
commit ebf85e50c0
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgfortran/ChangeLog
View File

@ -1,3 +1,9 @@
2006-04-11 Jakub Jelinek <jakub@redhat.com>
* io/io.h (st_parameter_dt): Revert 2005-12-10 change to
u.pad, fix comment.
(check_st_parameter_dt): New compile time assert.
2006-04-10 Jakub Jelinek <jakub@redhat.com> 2006-04-10 Jakub Jelinek <jakub@redhat.com>
PR libgfortran/24685 PR libgfortran/24685

12
libgfortran/io/io.h
View File

@ -436,13 +436,19 @@ typedef struct st_parameter_dt
char value[32]; char value[32];
gfc_offset size_used; gfc_offset size_used;
} p; } p;
/* This pad size must be greater than or equal to the pad_size declared in /* This pad size must be equal to the pad_size declared in
trans-io.c (gfc_build_io_library_fndecls) */ trans-io.c (gfc_build_io_library_fndecls). The above structure
char pad[16 * sizeof (char *) + 34 * sizeof (int)]; must be smaller or equal to this array. */
char pad[16 * sizeof (char *) + 32 * sizeof (int)];
} u; } u;
} }
st_parameter_dt; st_parameter_dt;
/* Ensure st_parameter_dt's u.pad is bigger or equal to u.p. */
extern char check_st_parameter_dt[sizeof (((st_parameter_dt *) 0)->u.pad)
>= sizeof (((st_parameter_dt *) 0)->u.p)
? 1 : -1];
#undef CHARACTER1 #undef CHARACTER1
#undef CHARACTER2 #undef CHARACTER2