From 3568074438b66ec38030db7e1a604158f73fc630 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Wed, 20 May 1998 10:04:25 +0000 Subject: cp-tree.h (MAIN_NAME_P): New macro. * cp-tree.h (MAIN_NAME_P): New macro. (DECL_MAIN_P): Likwise. * decl.c (pushdecl): Avoid crashing on redefinitions of `main'. (grokfndecl): Use the new macros. (grokdeclarator): Likewise. (start_function): Likewise. (store_parm_decls): Likewise. (finsh_function): Likewise. * friend.c (do_friend): Likewise. * typeck.c (build_function_call_real): Likewise. (build_unary_op): Likewise. From-SVN: r19907 --- gcc/cp/friend.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gcc/cp/friend.c') diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c index 52a84a5..6f40f0a 100644 --- a/gcc/cp/friend.c +++ b/gcc/cp/friend.c @@ -364,9 +364,7 @@ do_friend (ctype, declarator, decl, parmdecls, flags, quals, funcdef_flag) } } else if (TREE_CODE (decl) == FUNCTION_DECL - && ((IDENTIFIER_LENGTH (declarator) == 4 - && IDENTIFIER_POINTER (declarator)[0] == 'm' - && ! strcmp (IDENTIFIER_POINTER (declarator), "main")) + && (MAIN_NAME_P (declarator) || (IDENTIFIER_LENGTH (declarator) > 10 && IDENTIFIER_POINTER (declarator)[0] == '_' && IDENTIFIER_POINTER (declarator)[1] == '_' -- cgit v1.1