diff options
| author | Kai Tietz <kai.tietz@onevision.com> | 2009-08-14 19:30:13 +0000 |
|---|---|---|
| committer | Kai Tietz <ktietz@gcc.gnu.org> | 2009-08-14 21:30:13 +0200 |
| commit | 9d3458531a0a177e9a83f19481f691a139bc4ae7 (patch) | |
| tree | a54fc9c123aa90c1a9e34071f484d6b48946dbbc | |
| parent | 387c39e1ec5495397ee67700ca21c971910fc28a (diff) | |
| download | gcc-9d3458531a0a177e9a83f19481f691a139bc4ae7.zip gcc-9d3458531a0a177e9a83f19481f691a139bc4ae7.tar.gz gcc-9d3458531a0a177e9a83f19481f691a139bc4ae7.tar.bz2 | |
string_intrinsics_inc.c (string_len_trim): Use __INTPTR_TYPE__ to cast from pointer to scalar integer...
2009-08-15 Kai Tietz <kai.tietz@onevision.com>
* intrinsics/string_intrinsics_inc.c (string_len_trim): Use
__INTPTR_TYPE__ to cast from pointer to scalar integer, if
__INTPTR_TYPE is defined.
From-SVN: r150774
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/intrinsics/string_intrinsics_inc.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 979e789..f441049 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2009-08-15 Kai Tietz <kai.tietz@onevision.com> + + * intrinsics/string_intrinsics_inc.c (string_len_trim): Use + __INTPTR_TYPE__ to cast from pointer to scalar integer, if + __INTPTR_TYPE is defined. + 2009-08-14 Janne Blomqvist <jb@gcc.gnu.org> * fmain.c: Add comment saying file is deprecated. diff --git a/libgfortran/intrinsics/string_intrinsics_inc.c b/libgfortran/intrinsics/string_intrinsics_inc.c index f9fb1a2..64f5cd7 100644 --- a/libgfortran/intrinsics/string_intrinsics_inc.c +++ b/libgfortran/intrinsics/string_intrinsics_inc.c @@ -196,7 +196,11 @@ string_len_trim (gfc_charlen_type len, const CHARTYPE *s) /* Handle the first characters until we're aligned on a long word boundary. Actually, s + i + 1 must be properly aligned, because s + i will be the last byte of a long word read. */ - starting = ((unsigned long) (s + i + 1)) % long_len; + starting = ((unsigned long) +#ifdef __INTPTR_TYPE__ + (__INTPTR_TYPE__) +#endif + (s + i + 1)) % long_len; i -= starting; for (; starting > 0; --starting) if (s[i + starting] != ' ') |