aboutsummaryrefslogtreecommitdiff
path: root/gcc/c-pragma.c
diff options
context:
space:
mode:
authorKriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>2003-04-29 14:16:48 +0000
committerKriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>2003-04-29 14:16:48 +0000
commit68202f5efc776187b3eb2d0dbcb4437b9b2fe3a7 (patch)
tree4b529fc22b154cd30c59c6a41a28e5b12cd504b4 /gcc/c-pragma.c
parent022a278a2adca28bb79cf4e4b31a4e0eab383456 (diff)
* c-pragma.c (maybe_apply_renaming_pragma): Fix typo.
* gcc.c (display_help): Likewise. * toplev.c (f_options): Likewise. * params.def (PARAM_MAX_INLINE_SCOPE): Likewise. * config/c4x/c4x.h (TARGET_SWITCHES): Likewise. * config/mcore/mcore.h (TARGET_SWITCHES): Likewise. * config/s390/s390.h (TARGET_SWITCHES): Likewise. * config/v850/v850.h (TARGET_SWITCHES): Likewise. * call.c (build_operator_new_call): Fix typo. * lang-options.h: Likewise. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@66228 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-pragma.c')
-rw-r--r--gcc/c-pragma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/c-pragma.c b/gcc/c-pragma.c
index 78e9d9dd105..7f026d10b69 100644
--- a/gcc/c-pragma.c
+++ b/gcc/c-pragma.c
@@ -449,7 +449,7 @@ maybe_apply_renaming_pragma (decl, asmname)
{
const char *oldasmname = IDENTIFIER_POINTER (oldname) + 1;
if (asmname && strcmp (TREE_STRING_POINTER (asmname), oldasmname) != 0)
- warning ("asm declaration conficts with previous rename");
+ warning ("asm declaration conflicts with previous rename");
asmname = build_string (strlen (oldasmname), oldasmname);
}