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  <arnez@linux.vnet.ibm.com>
+
+	* gdb.base/solib1.c: Remove #ifdef PROTOTYPES, keep prototyped
+	variant.
+
 2014-11-13  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* 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
+extern "C"
+#endif
+int
 solib_main (int arg)
-#else
-#ifdef PROTOTYPES
-int  solib_main (int arg)
-#else
-int  solib_main (arg)
-  int  arg;
-#endif
-#endif
 {
   return arg*arg;		/* HERE */
 }				/* STEP */