@@ -1,9 +1,9 @@
 /* Trampoline test */
 
 /*
- * Copyright 1995-1999, 2002 Bruno Haible, <bruno@clisp.org>
+ * Copyright 1995-1999, 2002, 2005 Bruno Haible, <bruno@clisp.org>
  *
  * This is free software distributed under the GNU General Public Licence
  * described in the file COPYING. Contact the author if you don't have this
  * or can't live with it. There is ABSOLUTELY NO WARRANTY, explicit or implied,
  * on this software.
@@ -25,16 +25,11 @@
 typedef int (*function)();
 #endif
 
 void* function_data;
 
-#if defined(__STDC__) || defined(__GNUC__) || defined(__cplusplus)
 int f (int x)
-#else
-int f (x)
-  int x;
-#endif
 { return *(int*)function_data + x; }
 
 int main ()
 {
   function cf = alloc_trampoline((function)&f, &function_data, &magic);