diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-03-11 16:12:22 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-03-11 16:12:22 -0800 |
| commit | bc636c218f2b28da06cd1404d5b35d1f8cc43fd1 (patch) | |
| tree | 764937d8460563db6132d7c75e19b95ef3ea6ea8 /libcpp/include | |
| parent | 89d7be42db00cd0953e7d4584877cf50a56ed046 (diff) | |
| parent | 7ad5a72c8bc6aa71a0d195ddfa207db01265fe0b (diff) | |
| download | gcc-bc636c218f2b28da06cd1404d5b35d1f8cc43fd1.zip gcc-bc636c218f2b28da06cd1404d5b35d1f8cc43fd1.tar.gz gcc-bc636c218f2b28da06cd1404d5b35d1f8cc43fd1.tar.bz2 | |
Merge from trunk revision 7ad5a72c8bc6aa71a0d195ddfa207db01265fe0b.
Diffstat (limited to 'libcpp/include')
| -rw-r--r-- | libcpp/include/cpplib.h | 4 | ||||
| -rw-r--r-- | libcpp/include/line-map.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 17feb64..41d75d9 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -1012,8 +1012,8 @@ extern cpp_callbacks *cpp_get_callbacks (cpp_reader *) ATTRIBUTE_PURE; extern void cpp_set_callbacks (cpp_reader *, cpp_callbacks *); extern class mkdeps *cpp_get_deps (cpp_reader *) ATTRIBUTE_PURE; -extern const char *cpp_find_header_unit (cpp_reader *, const char *file, - bool angle_p, location_t); +extern const char *cpp_probe_header_unit (cpp_reader *, const char *file, + bool angle_p, location_t); /* Call these to get name data about the various compile-time charsets. */ diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h index d5fc118..40919d0 100644 --- a/libcpp/include/line-map.h +++ b/libcpp/include/line-map.h @@ -1136,8 +1136,9 @@ extern location_t linemap_module_loc extern void linemap_module_reparent (line_maps *, location_t loc, location_t new_parent); -/* Restore the linemap state such that the map at LWM-1 continues. */ -extern void linemap_module_restore +/* Restore the linemap state such that the map at LWM-1 continues. + Return start location of the new map. */ +extern unsigned linemap_module_restore (line_maps *, unsigned lwm); /* Given a logical source location, returns the map which the |