From b80a981d0867f554d382eef9fc16081b12ac0543 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 21 May 2018 09:21:18 -0600 Subject: [PATCH] Remove EXTERN from buildsym.h Nothing in buildsym.h relies on the "EXTERN" method of declaration/definition, so remove the traces. gdb/ChangeLog 2018-07-20 Tom Tromey * buildsym.h (EXTERN): Don't define or undef. * buildsym.c (EXTERN): Don't define. --- gdb/ChangeLog | 5 +++++ gdb/buildsym.c | 7 +------ gdb/buildsym.h | 13 +------------ 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3b8de34b083..f695ce26b89 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-07-20 Tom Tromey + + * buildsym.h (EXTERN): Don't define or undef. + * buildsym.c (EXTERN): Don't define. + 2018-07-20 Tom Tromey * buildsym.c: Remove TODO comment. diff --git a/gdb/buildsym.c b/gdb/buildsym.c index e6eb711f4b9..dffd077ed69 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -62,6 +62,7 @@ */ #include "defs.h" +#include "buildsym.h" #include "bfd.h" #include "gdb_obstack.h" #include "symtab.h" @@ -79,12 +80,6 @@ #include "addrmap.h" #include -/* Ask buildsym.h to define the vars it normally declares `extern'. */ -#define EXTERN -/**/ -#include "buildsym.h" /* Our own declarations. */ -#undef EXTERN - /* For cleanup_undefined_stabs_types and finish_global_stabs (somewhat questionable--see comment where we call them). */ diff --git a/gdb/buildsym.h b/gdb/buildsym.h index 9f043141eca..220d7f48fe4 100644 --- a/gdb/buildsym.h +++ b/gdb/buildsym.h @@ -30,22 +30,13 @@ enum language; file-reading routines. They originated in dbxread.c of gdb-4.2, and were split out to - make xcoffread.c more maintainable by sharing code. - - Variables declared in this file can be defined by #define-ing the - name EXTERN to null. It is used to declare variables that are - normally extern, but which get defined in a single module using - this technique. */ + make xcoffread.c more maintainable by sharing code. */ struct block; struct pending_block; struct dynamic_prop; -#ifndef EXTERN -#define EXTERN extern -#endif - /* The list of sub-source-files within the current individual compilation. Each file gets its own symtab with its own linetable and associated info, but they all share one blockvector. */ @@ -271,6 +262,4 @@ extern struct pending **get_file_symbols (); extern struct pending **get_global_symbols (); -#undef EXTERN - #endif /* defined (BUILDSYM_H) */ -- 2.30.2