OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add extern "C" to declarations of C symbols

Browse Source 
These symbols are defined in C code, so in C++ mode we need to use
extern "C" to declare them.  As extern "C" can't be used inside a
function's scope, we move the declarations to the global scope at the
same time.

gdb/ChangeLog:
2015-02-27  Pedro Alves  <palves@redhat.com>

	* cli-out.c (_rl_erase_entire_line): Move declaration out of
	cli_mld_erase_entire_line, and make it extern "C".
	* common/common-defs.h (EXTERN_C): New.
	* completer.c (_rl_completion_prefix_display_length)
	(_rl_print_completions_horizontally, QSFUNC): Move declarations
	out of gdb_display_match_list_1.
	(_rl_qsort_string_compare): Move declaration out of
	gdb_display_match_list_1, and make it extern "C".
	* defs.h (re_comp): Use EXTERN_C.
	* maint.c (_mcleanup): Move declaration out of mcleanup_wrapper,
	and make it extern "C".
	(monstartup): Move declaration out of maintenance_set_profile_cmd,
	and make it extern "C".
	(main): Move declaration out of maintenance_set_profile_cmd.
	* nat/linux-ptrace.c (linux_ptrace_attach_fail_reason_string): Use
	EXTERN_C.
This commit is contained in:
Pedro Alves 2015-02-09 14:59:08 +00:00
parent bcabf4207e
commit 56000a9801
7 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gdb/ChangeLog
View File

@ -1,3 +1,22 @@
2015-02-27 Pedro Alves <palves@redhat.com>
* cli-out.c (_rl_erase_entire_line): Move declaration out of
cli_mld_erase_entire_line, and make it extern "C".
* common/common-defs.h (EXTERN_C): New.
* completer.c (_rl_completion_prefix_display_length)
(_rl_print_completions_horizontally, QSFUNC): Move declarations
out of gdb_display_match_list_1.
(_rl_qsort_string_compare): Move declaration out of
gdb_display_match_list_1, and make it extern "C".
* defs.h (re_comp): Use EXTERN_C.
* maint.c (_mcleanup): Move declaration out of mcleanup_wrapper,
and make it extern "C".
(monstartup): Move declaration out of maintenance_set_profile_cmd,
and make it extern "C".
(main): Move declaration out of maintenance_set_profile_cmd.
* nat/linux-ptrace.c (linux_ptrace_attach_fail_reason_string): Use
EXTERN_C.
2015-02-27 Pedro Alves <palves@redhat.com>
* python/python.c (GdbMethods): Rename to ...

4
gdb/cli-out.c
View File

@ -452,13 +452,13 @@ cli_mld_flush (const struct match_list_displayer *displayer)
fflush (rl_outstream);
}
EXTERN_C void _rl_erase_entire_line (void);
/* CLI version of displayer.erase_entire_line. */
static void
cli_mld_erase_entire_line (const struct match_list_displayer *displayer)
{
extern void _rl_erase_entire_line (void);
_rl_erase_entire_line ();
}

6
gdb/common/common-defs.h
View File

@ -50,4 +50,10 @@
#include "cleanups.h"
#include "common-exceptions.h"
#ifdef __cplusplus
# define EXTERN_C extern "C"
#else
# define EXTERN_C extern
#endif
#endif /* COMMON_DEFS_H */

10
gdb/completer.c
View File

@ -1548,6 +1548,12 @@ gdb_complete_get_screenwidth (const struct match_list_displayer *displayer)
return displayer->width;
}
extern int _rl_completion_prefix_display_length;
extern int _rl_print_completions_horizontally;
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.
See gdb_display_match_list for a description of MATCHES, LEN, MAX.
Returns non-zero if all matches are displayed. */
@ -1560,10 +1566,6 @@ gdb_display_match_list_1 (char **matches, int len, int max,
int i, j, k, l, common_length, sind;
char *temp, *t;
int page_completions = displayer->height != INT_MAX && pagination_enabled;
extern int _rl_completion_prefix_display_length;
extern int _rl_qsort_string_compare (const void *, const void *);
extern int _rl_print_completions_horizontally;
typedef int QSFUNC (const void *, const void *);
/* Find the length of the prefix common to all items: length as displayed
characters (common_length) and as a byte index into the matches (sind) */

2
gdb/defs.h
View File

@ -249,7 +249,7 @@ extern int annotation_level; /* in stack.c */
"const char *" in unistd.h, so we can't declare the argument
as "char *". */
extern char *re_comp (const char *);
EXTERN_C char *re_comp (const char *);
/* From symfile.c */

10
gdb/maint.c
View File

@ -683,15 +683,18 @@ extern char etext;
static int profiling_state;
EXTERN_C void _mcleanup (void);
static void
mcleanup_wrapper (void)
{
extern void _mcleanup (void);
if (profiling_state)
_mcleanup ();
}
EXTERN_C void monstartup (unsigned long, unsigned long);
extern int main ();
static void
maintenance_set_profile_cmd (char *args, int from_tty,
struct cmd_list_element *c)
@ -705,9 +708,6 @@ maintenance_set_profile_cmd (char *args, int from_tty,
{
static int profiling_initialized;
extern void monstartup (unsigned long, unsigned long);
extern int main();
if (!profiling_initialized)
{
atexit (mcleanup_wrapper);

2
gdb/nat/linux-ptrace.c
View File

@ -84,7 +84,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 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>