Remove EXTERN_C and related defines

common-defs.h has a few defines that I suspect were used during the
transition to C++.  These aren't needed any more, so remove them.

Tested by rebuilding.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
Approved-By: Andrew Burgess <aburgess@redhat.com>

8 files changed, 9 insertions, 9 deletions

diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index 20d3d93..a1cde54 100644
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -493,7 +493,7 @@ cli_mld_flush (const struct match_list_displayer *displayer)
   fflush (rl_outstream);
 }
 
-EXTERN_C void _rl_erase_entire_line (void);
+extern "C" void _rl_erase_entire_line (void);
 
 /* CLI version of displayer.erase_entire_line.  */
 
diff --git a/gdb/completer.c b/gdb/completer.c
index 2abf399..8942a3f 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -2812,7 +2812,7 @@ gdb_complete_get_screenwidth (const struct match_list_displayer *displayer)
 extern int _rl_completion_prefix_display_length;
 extern int _rl_print_completions_horizontally;
 
-EXTERN_C int _rl_qsort_string_compare (const void *, const void *);
+extern "C" int _rl_qsort_string_compare (const void *, const void *);
 typedef int QSFUNC (const void *, const void *);
 
 /* GDB version of readline/complete.c:rl_display_match_list.
diff --git a/gdb/defs.h b/gdb/defs.h
index f5af3e6..b8612e1 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -303,7 +303,7 @@ extern int annotation_level;	/* in stack.c */
    "const char *" in unistd.h, so we can't declare the argument
    as "char *".  */
 
-EXTERN_C char *re_comp (const char *);
+extern "C" char *re_comp (const char *);
 
 /* From symfile.c */
 
diff --git a/gdb/event-top.c b/gdb/event-top.c
index 3d6fa89..9886ca4 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -138,7 +138,7 @@ static struct async_signal_handler *async_sigterm_token;
 void (*after_char_processing_hook) (void);
 
 #if RL_VERSION_MAJOR == 7
-EXTERN_C void _rl_signal_handler (int);
+extern "C" void _rl_signal_handler (int);
 #endif
 
 /* Wrapper function for calling into the readline library.  This takes
diff --git a/gdb/gdb_curses.h b/gdb/gdb_curses.h
index 7ac0ade..39bf6f1 100644
--- a/gdb/gdb_curses.h
+++ b/gdb/gdb_curses.h
@@ -60,7 +60,7 @@
    of the termcap functions will be built from stub-termcap.c.  Readline
    provides its own extern declarations when there's no termcap.h; do the
    same here for the termcap functions used in GDB.  */
-EXTERN_C int tgetnum (const char *);
+extern "C" int tgetnum (const char *);
 #endif
 
 /* SunOS's curses.h has a '#define reg register' in it.  Thank you Sun.  */
diff --git a/gdb/maint.c b/gdb/maint.c
index 0635af3..c1154d0 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -791,7 +791,7 @@ extern char etext;
 
 static int profiling_state;
 
-EXTERN_C void _mcleanup (void);
+extern "C" void _mcleanup (void);
 
 static void
 mcleanup_wrapper (void)
@@ -800,7 +800,7 @@ mcleanup_wrapper (void)
     _mcleanup ();
 }
 
-EXTERN_C void monstartup (unsigned long, unsigned long);
+extern "C" void monstartup (unsigned long, unsigned long);
 extern int main (int, char **);
 
 static void
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index b80c7b8..e259f65 100644
--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
@@ -70,7 +70,7 @@ linux_ptrace_attach_fail_reason_string (ptid_t ptid, int err)
 #if defined __i386__ || defined __x86_64__
 
 /* Address of the 'ret' instruction in asm code block below.  */
-EXTERN_C void linux_ptrace_test_ret_to_nx_instr (void);
+extern "C" void linux_ptrace_test_ret_to_nx_instr (void);
 
 #include <sys/reg.h>
 #include <sys/mman.h>
diff --git a/gdb/utils.c b/gdb/utils.c
index a191d26..f959af3 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1112,7 +1112,7 @@ static bool filter_initialized = false;
 
 /* See readline's rlprivate.h.  */
 
-EXTERN_C int _rl_term_autowrap;
+extern "C" int _rl_term_autowrap;
 
 /* See utils.h.  */