aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-lang.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index efe62f9..bf2434b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 21 14:30:51 1999 Bernd Schmidt <bernds@cygnus.co.uk>
+
+ * c-lang.c (finish_file): Rename void_list_node to void_list_node_1
+ to avoid name clash.
+
Wed Jul 21 08:39:22 1999 Gavin Romig-Koch <gavin@cygnus.com>
* c-lex.c (yylex) : Correct the test for overflow when lexing
diff --git a/gcc/c-lang.c b/gcc/c-lang.c
index 4c55411..8f37cab 100644
--- a/gcc/c-lang.c
+++ b/gcc/c-lang.c
@@ -168,14 +168,14 @@ finish_file ()
#endif
extern tree build_function_call PROTO((tree, tree));
#if !defined(ASM_OUTPUT_CONSTRUCTOR) || !defined(ASM_OUTPUT_DESTRUCTOR)
- tree void_list_node = build_tree_list (NULL_TREE, void_type_node);
+ tree void_list_node_1 = build_tree_list (NULL_TREE, void_type_node);
#endif
#ifndef ASM_OUTPUT_CONSTRUCTOR
if (static_ctors)
{
tree fnname = get_file_function_name ('I');
- start_function (void_list_node,
- build_parse_node (CALL_EXPR, fnname, void_list_node,
+ start_function (void_list_node_1,
+ build_parse_node (CALL_EXPR, fnname, void_list_node_1,
NULL_TREE),
NULL_TREE, NULL_TREE, 0);
fnname = DECL_ASSEMBLER_NAME (current_function_decl);
@@ -194,8 +194,8 @@ finish_file ()
if (static_dtors)
{
tree fnname = get_file_function_name ('D');
- start_function (void_list_node,
- build_parse_node (CALL_EXPR, fnname, void_list_node,
+ start_function (void_list_node_1,
+ build_parse_node (CALL_EXPR, fnname, void_list_node_1,
NULL_TREE),
NULL_TREE, NULL_TREE, 0);
fnname = DECL_ASSEMBLER_NAME (current_function_decl);