From 58364ce8a1cbbcf5aafa5e8b41e77dd71bb64110 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Sun, 7 Oct 2001 17:23:43 +0000 Subject: merge from gcc --- include/ChangeLog | 5 +++++ include/demangle.h | 10 +++++----- include/libiberty.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/ChangeLog b/include/ChangeLog index 030ebfe..985b1ea 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2001-10-07 Kaveh R. Ghazi + + * demangle.h (demangler_engine): Const-ify. + * libiberty.h (buildargv): Likewise. + 2001-10-03 Vassili Karpov * bfdlink.h (struct bfd_link_info): Add nocopyreloc field. diff --git a/include/demangle.h b/include/demangle.h index dc1e1f1..a314a24 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -1,5 +1,5 @@ /* Defs for interface to demanglers. - Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000 + Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -94,11 +94,11 @@ extern enum demangling_styles /* Provide information about the available demangle styles. This code is pulled from gdb into libiberty because it is useful to binutils also. */ -extern struct demangler_engine +extern const struct demangler_engine { - const char *demangling_style_name; - enum demangling_styles demangling_style; - const char *demangling_style_doc; + const char *const demangling_style_name; + const enum demangling_styles demangling_style; + const char *const demangling_style_doc; } libiberty_demanglers[]; extern char * diff --git a/include/libiberty.h b/include/libiberty.h index 315d310..9501365 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -51,7 +51,7 @@ extern "C" { /* Build an argument vector from a string. Allocates memory using malloc. Use freeargv to free the vector. */ -extern char **buildargv PARAMS ((char *)) ATTRIBUTE_MALLOC; +extern char **buildargv PARAMS ((const char *)) ATTRIBUTE_MALLOC; /* Free a vector returned by buildargv. */ -- cgit v1.1