From 6122f1884a2c86718a2b0c5070ce991adb3e3215 Mon Sep 17 00:00:00 2001 From: lerdsuwa Date: Tue, 29 Apr 2003 14:16:48 +0000 Subject: * 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: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66228 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/c-pragma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc/c-pragma.c') 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); } -- cgit v1.2.1