diff options
| author | Paul Brook <paul@codesourcery.com> | 2004-09-17 17:07:43 +0000 |
|---|---|---|
| committer | Paul Brook <pbrook@gcc.gnu.org> | 2004-09-17 17:07:43 +0000 |
| commit | 4cdf72233bf62dc514506547a73231914d50c42f (patch) | |
| tree | c2b3a1d2ca9ee4e8559293e55aae97bbeb8ef3fe /gcc | |
| parent | fa151acf6d05dda7cb79e749aa4dcf2ff0f0c385 (diff) | |
| download | gcc-4cdf72233bf62dc514506547a73231914d50c42f.zip gcc-4cdf72233bf62dc514506547a73231914d50c42f.tar.gz gcc-4cdf72233bf62dc514506547a73231914d50c42f.tar.bz2 | |
gfortran.h (struct gfc_linebuf): Don't use C99 empty arrays.
* gfortran.h (struct gfc_linebuf): Don't use C99 empty arrays.
(gfc_linebuf_header_size): Define.
* scanner.c (load_file): Use it.
From-SVN: r87655
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/gfortran.h | 6 | ||||
| -rw-r--r-- | gcc/fortran/scanner.c | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fb23069..4d4b445 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2004-09-17 Paul Brook <paul@codesourcery.com> + + * gfortran.h (struct gfc_linebuf): Don't use C99 empty arrays. + (gfc_linebuf_header_size): Define. + * scanner.c (load_file): Use it. + 2004-09-16 Kazu Hirata <kazu@cs.umass.edu> * array.c, data.c, decl.c, dependency.c, error.c, f95-lang.c, diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 8ec9215..94d5374 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -469,9 +469,11 @@ typedef struct gfc_linebuf struct gfc_file *file; struct gfc_linebuf *next; - char line[]; + char line[1]; } gfc_linebuf; - + +#define gfc_linebuf_header_size (offsetof (gfc_linebuf, line)) + typedef struct { char *nextc; diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c index 9f03c77..3c6ca19 100644 --- a/gcc/fortran/scanner.c +++ b/gcc/fortran/scanner.c @@ -1034,7 +1034,7 @@ load_file (char *filename, bool initial) /* Add line. */ - b = gfc_getmem (sizeof (gfc_linebuf) + len + 1); + b = gfc_getmem (gfc_linebuf_header_size + len + 1); #ifdef USE_MAPPED_LOCATION b->location |