From ddb6d633875b76f9d772af901118233fc498253a Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 6 Oct 2016 19:23:37 +0100 Subject: gdb: Remove some C compiler support leftovers Remove some __cplusplus checks, inline EXPORTED_CONST, and update some comments. gdb/ChangeLog: 2016-10-06 Pedro Alves * cp-valprint.c (vtbl_ptr_name): Write "extern const" instead of EXPORTED_CONST. * stub-termcap.c: Remove __cplusplus checks. * common/common-defs.h [!__cplusplus] (EXTERN_C, EXTERN_C_PUSH, EXTERN_C_POP): Delete. * common/common-exceptions.h (GDB_XCPT_SJMP): Update comments. (GDB_XCPT) [!__cplusplus]: Delete. (throw_exception, throw_exception_sjlj): Update comments. * guile/guile-internal.h (as_a_scm_t_subr) [!__cplusplus]: Delete. * guile/guile.c (extension_language_guile): Write "extern const" instead of EXPORTED_CONST. * features/feature_to_c.sh: Don't emit !__cplusplus code. Write "extern const" instead of EXPORTED_CONST. --- gdb/guile/guile-internal.h | 8 -------- gdb/guile/guile.c | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'gdb/guile') diff --git a/gdb/guile/guile-internal.h b/gdb/guile/guile-internal.h index 0aa4a0a..5f819b8 100644 --- a/gdb/guile/guile-internal.h +++ b/gdb/guile/guile-internal.h @@ -50,8 +50,6 @@ typedef struct #define END_VARIABLES { NULL, SCM_BOOL_F, NULL } -#ifdef __cplusplus - /* Although scm_t_subr is meant to hold a function pointer, at least in some versions of guile, it is actually a typedef to "void *". That means that in C++, an explicit cast is necessary to convert @@ -88,12 +86,6 @@ as_a_scm_t_subr (SCM (*func) (SCM, SCM, SCM)) return (scm_t_subr) func; } -#else - -/* In C, just do an implicit conversion. */ -#define as_a_scm_t_subr(func) func - -#endif /* Scheme functions to define during initialization. */ typedef struct diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c index 117561d..3a19eec 100644 --- a/gdb/guile/guile.c +++ b/gdb/guile/guile.c @@ -77,7 +77,7 @@ extern const struct extension_language_ops guile_extension_ops; /* The main struct describing GDB's interface to the Guile extension language. */ -EXPORTED_CONST struct extension_language_defn extension_language_guile = +extern const struct extension_language_defn extension_language_guile = { EXT_LANG_GUILE, "guile", -- cgit v1.1