aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2002-01-03 00:25:57 +0000
committerDJ Delorie <dj@redhat.com>2002-01-03 00:25:57 +0000
commitc23795e245459a861d4083299bda10cfe9fd2a1a (patch)
treefd02f2503abd6b9262deb870efc828727f487063
parent02e3d9701f0d36cfc28f6902583fce1f92103aed (diff)
downloadgdb-c23795e245459a861d4083299bda10cfe9fd2a1a.zip
gdb-c23795e245459a861d4083299bda10cfe9fd2a1a.tar.gz
gdb-c23795e245459a861d4083299bda10cfe9fd2a1a.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog3
-rw-r--r--libiberty/cp-demangle.c2
-rw-r--r--libiberty/cplus-dem.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 9292971..fdccb59a 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,5 +1,8 @@
2002-01-02 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+ * cp-demangle.c (long_options): Const-ify.
+ * cplus-dem.c (long_options): Likewise.
+
* cplus-dem.c (mystrstr): Delete. All callers changed to use
strstr instead.
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index b61ff2c..457a09f 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -3945,7 +3945,7 @@ print_usage (fp, exit_value)
}
/* Option specification for getopt_long. */
-static struct option long_options[] =
+static const struct option long_options[] =
{
{ "help", no_argument, NULL, 'h' },
{ "strict", no_argument, NULL, 's' },
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 691eb71..5af8826 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -4947,7 +4947,7 @@ extern int prepends_underscore;
int strip_underscore = 0;
-static struct option long_options[] = {
+static const struct option long_options[] = {
{"strip-underscores", no_argument, 0, '_'},
{"format", required_argument, 0, 's'},
{"help", no_argument, 0, 'h'},