aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cpplib.c7
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 53183a0..8d1646e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-18 Zack Weinberg <zack@wolery.cumb.org>
+
+ * cpplib.c (cpp_register_pragma_space): Just return if the
+ namespace is already registered.
+
2000-08-18 Ray Essick <essick@ddna.labs.mot.com> & Nick Clifton <nickc@redhat.com>
* config/mcore/mcore.md (rotlsi3): Allow allow rotations by a
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index 5dd1697..274ca4a 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -689,10 +689,9 @@ cpp_register_pragma_space (pfile, space)
while (p)
{
if (p->isnspace && p->len == len && !memcmp (p->name, space, len))
- {
- cpp_ice (pfile, "#pragma namespace %s already registered", space);
- return;
- }
+ /* Multiple different callers are allowed to register the same
+ namespace. */
+ return;
p = p->next;
}