aboutsummaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authorMarc Glisse <marc.glisse@inria.fr>2013-01-03 21:06:49 +0100
committerMarc Glisse <glisse@gcc.gnu.org>2013-01-03 20:06:49 +0000
commit8ac16127cf8c60a4fd33288cb044043cbf014bd6 (patch)
tree8333424ab8e4eaff4241a11934358310633c59e2 /libcpp
parentffa6d5dfbfd38f61a92c5dc7ff18074f893da1c4 (diff)
downloadgcc-8ac16127cf8c60a4fd33288cb044043cbf014bd6.zip
gcc-8ac16127cf8c60a4fd33288cb044043cbf014bd6.tar.gz
gcc-8ac16127cf8c60a4fd33288cb044043cbf014bd6.tar.bz2
re PR bootstrap/50167 (gmp memory functions are extern "C" (graphite))
2013-01-03 Marc Glisse <marc.glisse@inria.fr> PR bootstrap/50167 gcc/ * graphite-interchange.c (pdr_stride_in_loop): Use gmp_fprintf. * graphite-poly.c (debug_gmp_value): Likewise. PR bootstrap/50177 libcpp/ * line-map.c (get_combined_adhoc_loc): Cast from extern "C" type. (new_linemap): Likewise. (linemap_enter_macro): Likewise. From-SVN: r194868
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/ChangeLog7
-rw-r--r--libcpp/line-map.c18
2 files changed, 19 insertions, 6 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index fc78ca8..332efa3 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-03 Marc Glisse <marc.glisse@inria.fr>
+
+ PR bootstrap/50177
+ * line-map.c (get_combined_adhoc_loc): Cast from extern "C" type.
+ (new_linemap): Likewise.
+ (linemap_enter_macro): Likewise.
+
2012-12-03 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/55380
diff --git a/libcpp/line-map.c b/libcpp/line-map.c
index 61ab031..49b9487 100644
--- a/libcpp/line-map.c
+++ b/libcpp/line-map.c
@@ -122,8 +122,10 @@ get_combined_adhoc_loc (struct line_maps *set,
{
char *orig_data = (char *) set->location_adhoc_data_map.data;
long long offset;
- line_map_realloc reallocator
- = set->reallocator ? set->reallocator : xrealloc;
+ /* Cast away extern "C" from the type of xrealloc. */
+ line_map_realloc reallocator = (set->reallocator
+ ? set->reallocator
+ : (line_map_realloc) xrealloc);
if (set->location_adhoc_data_map.allocated == 0)
set->location_adhoc_data_map.allocated = 128;
@@ -217,8 +219,10 @@ new_linemap (struct line_maps *set,
/* We ran out of allocated line maps. Let's allocate more. */
unsigned alloc_size;
- line_map_realloc reallocator
- = set->reallocator ? set->reallocator : xrealloc;
+ /* Cast away extern "C" from the type of xrealloc. */
+ line_map_realloc reallocator = (set->reallocator
+ ? set->reallocator
+ : (line_map_realloc) xrealloc);
line_map_round_alloc_size_func round_alloc_size =
set->round_alloc_size;
@@ -430,8 +434,10 @@ linemap_enter_macro (struct line_maps *set, struct cpp_hashnode *macro_node,
{
struct line_map *map;
source_location start_location;
- line_map_realloc reallocator
- = set->reallocator ? set->reallocator : xrealloc;
+ /* Cast away extern "C" from the type of xrealloc. */
+ line_map_realloc reallocator = (set->reallocator
+ ? set->reallocator
+ : (line_map_realloc) xrealloc);
start_location = LINEMAPS_MACRO_LOWEST_LOCATION (set) - num_tokens;