From e444df73e954bf24d9dc6a4eaeb5153b3faee973 Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Thu, 23 Oct 2014 14:27:57 +0000 Subject: [PATCH] Drop non-prototype C function header variants: solib1.c Clean up solib1.c by removing the #ifdef PROTOTYPES conditional. gdb/testsuite/ChangeLog: * gdb.base/solib1.c: Remove #ifdef PROTOTYPES, keep prototyped variant. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/solib1.c | 12 +++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 73aff6033f1..ae4d0bc5c4e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-11-13 Andreas Arnez + + * gdb.base/solib1.c: Remove #ifdef PROTOTYPES, keep prototyped + variant. + 2014-11-13 Andreas Arnez * gdb.base/callfuncs.exp (perform_all_tests): Re-indent. diff --git a/gdb/testsuite/gdb.base/solib1.c b/gdb/testsuite/gdb.base/solib1.c index 224a93d7a40..c7d17f49f41 100644 --- a/gdb/testsuite/gdb.base/solib1.c +++ b/gdb/testsuite/gdb.base/solib1.c @@ -3,16 +3,10 @@ the square of its integer argument. */ #if defined(__cplusplus) || defined(__STDCPP__) -extern "C" int -solib_main (int arg) -#else -#ifdef PROTOTYPES -int solib_main (int arg) -#else -int solib_main (arg) - int arg; -#endif +extern "C" #endif +int +solib_main (int arg) { return arg*arg; /* HERE */ } /* STEP */ -- 2.30.2