diff options
author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-08-29 20:02:46 +0000 |
---|---|---|
committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-08-29 20:02:46 +0000 |
commit | 2ec36bc1f097984516cc4ea5a3a2f179cb6ddd29 (patch) | |
tree | b47aa7b3e9ee24e2b1aacea302811b1df5693a6b /libgfortran/generated/shape_i4.c | |
parent | 512bf04df5cce736de648cc30d8f90d067e998d0 (diff) | |
parent | 72709ee77118abb12560a4aa7aecffd1b1262fe4 (diff) | |
download | gcc-2ec36bc1f097984516cc4ea5a3a2f179cb6ddd29.tar.gz |
Merge from the trunk r235035
Note: Currently fails to bootstrap due to function
changed. Testsuite conflicts not fully resolved.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/fortran-dev@239839 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran/generated/shape_i4.c')
-rw-r--r-- | libgfortran/generated/shape_i4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libgfortran/generated/shape_i4.c b/libgfortran/generated/shape_i4.c index d261c86eca3..e9693a2b2e8 100644 --- a/libgfortran/generated/shape_i4.c +++ b/libgfortran/generated/shape_i4.c @@ -1,5 +1,5 @@ /* Implementation of the SHAPE intrinsic - Copyright (C) 2002-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2016 Free Software Foundation, Inc. Contributed by Paul Brook <paul@nowt.org> This file is part of the GNU Fortran runtime library (libgfortran). @@ -31,12 +31,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #if defined (HAVE_GFC_INTEGER_4) extern void shape_4 (gfc_array_i4 * const restrict ret, - const gfc_array_i4 * const restrict array); + const array_t * const restrict array); export_proto(shape_4); void shape_4 (gfc_array_i4 * const restrict ret, - const gfc_array_i4 * const restrict array) + const array_t * const restrict array) { int n; index_type stride; |