summaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authordanglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4>2016-06-22 01:46:06 +0000
committerdanglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4>2016-06-22 01:46:06 +0000
commitbd08c370d5a42f544c199e8b7bb49906b2dc0870 (patch)
tree7227251b43d09a6272f8ac01241575b8d81fba52 /libcpp
parentdf4d4b47d309366cebb966065cee6161dce06905 (diff)
downloadgcc-bd08c370d5a42f544c199e8b7bb49906b2dc0870.tar.gz
* c-common.c (get_source_date_epoch): Use int64_t instead of long long.
* gcov-tool.c (profile_rewrite): Use int64_t instead of long long. (do_rewrite): likewise. * line-map.c (location_adhoc_data_update): Use int64_t instead of long long. (get_combined_adhoc_loc): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@237676 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/ChangeLog6
-rw-r--r--libcpp/line-map.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 5d18c0a3ea3..c32b15725f8 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 2e61895bb35..8dea0d381c5 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