@@ -1,9 +1,9 @@
 /* Trampoline test */
 
 /*
- * Copyright 1995-1999, 2001-2002, 2004 Bruno Haible, <bruno@clisp.org>
+ * Copyright 1995-1999, 2001-2002, 2004-2006 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.
@@ -26,29 +26,22 @@
 #else
 typedef int (*function)();
 #endif
 
 #if defined(__i386__)
-#if defined(__STDC__) || defined(__GNUC__) || defined(__cplusplus)
 int f (void* env, int x)
 #else
-int f (env, x)
-  void* env;
-  int x;
-#endif
-#else
-#if defined(__STDC__) || defined(__GNUC__) || defined(__cplusplus)
 int f (int x)
-#else
-int f (x)
-  int x;
-#endif
 #endif
 {
 #ifdef __GNUC__
 #ifdef __m68k__
+#ifdef __NetBSD__
+register void* env __asm__("a1");
+#else
 register void* env __asm__("a0");
+#endif
 #endif
 #ifdef __mips__
 register void* env __asm__("$2");
 #endif
 #ifdef __mips64__
@@ -67,11 +60,11 @@
 register void* env __asm__("%r29");
 #endif
 #ifdef __arm__
 register void* env __asm__("r12");
 #endif
-#ifdef __rs6000__
+#ifdef __powerpc__
 #ifdef __NetBSD__
 register void* env __asm__("r13");
 #else
 register void* env __asm__("r11");
 #endif