diff options
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 6 | ||||
| -rw-r--r-- | libcpp/line-map.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 5d18c0a..c32b157 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2016-06-21 John David Anglin <danglin@gcc.gnu.org> + + * line-map.c (location_adhoc_data_update): Use int64_t instead of + long long. + (get_combined_adhoc_loc): Likewise. + 2016-06-01 Eduard Sanou <dhole@openmailbox.org> * include/cpplib.h (cpp_callbacks): Add get_source_date_epoch diff --git a/libcpp/line-map.c b/libcpp/line-map.c index 2e61895..8dea0d3 100644 --- a/libcpp/line-map.c +++ b/libcpp/line-map.c @@ -102,7 +102,7 @@ location_adhoc_data_eq (const void *l1, const void *l2) static int location_adhoc_data_update (void **slot, void *data) { - *((char **) slot) += *((long long *) data); + *((char **) slot) += *((int64_t *) data); return 1; } @@ -224,7 +224,7 @@ get_combined_adhoc_loc (struct line_maps *set, set->location_adhoc_data_map.allocated) { char *orig_data = (char *) set->location_adhoc_data_map.data; - long long offset; + int64_t offset; /* Cast away extern "C" from the type of xrealloc. */ line_map_realloc reallocator = (set->reallocator ? set->reallocator |
