Index: lib/argp-help.c
--- lib/argp-help.c.orig	2006-09-12 10:59:04 +0200
+++ lib/argp-help.c	2006-10-24 13:29:40 +0200
@@ -567,7 +567,7 @@
   return val;
 }
 
-static inline int
+static int
 __attribute__ ((always_inline))
 hol_entry_long_iterate (const struct hol_entry *entry,
 			int (*func)(const struct argp_option *opt,
@@ -592,7 +592,7 @@
 }
 
 /* Iterator that returns true for the first short option.  */
-static inline int
+static int
 until_short (const struct argp_option *opt, const struct argp_option *real,
 	     const char *domain, void *cookie)
 {
Index: lib/rtapelib.c
--- lib/rtapelib.c.orig	2006-02-20 10:46:01 +0100
+++ lib/rtapelib.c	2006-10-24 13:18:23 +0200
@@ -625,7 +625,7 @@
 {
   char command_buffer[COMMAND_BUFFER_SIZE];
   char operand_buffer[UINTMAX_STRSIZE_BOUND];
-  uintmax_t u = offset < 0 ? - (uintmax_t) offset : (uintmax_t) offset;
+  unsigned long u = offset < 0 ? - (unsigned long) offset : (unsigned long) offset;
   char *p = operand_buffer + sizeof operand_buffer;
 
   *--p = 0;
@@ -667,9 +667,9 @@
       {
 	char command_buffer[COMMAND_BUFFER_SIZE];
 	char operand_buffer[UINTMAX_STRSIZE_BOUND];
-	uintmax_t u = (((struct mtop *) argument)->mt_count < 0
-		       ? - (uintmax_t) ((struct mtop *) argument)->mt_count
-		       : (uintmax_t) ((struct mtop *) argument)->mt_count);
+	unsigned long u = (((struct mtop *) argument)->mt_count < 0
+		       ? - (unsigned long) ((struct mtop *) argument)->mt_count
+		       : (unsigned long) ((struct mtop *) argument)->mt_count);
 	char *p = operand_buffer + sizeof operand_buffer;
 
         *--p = 0;
Index: lib/system.h
--- lib/system.h.orig	2006-09-08 18:57:52 +0200
+++ lib/system.h	2006-10-24 13:18:23 +0200
@@ -425,7 +425,7 @@
 
 #include <intprops.h>
 
-#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (uintmax_t)
+#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (unsigned long)
 
 /* Prototypes for external functions.  */
 
Index: src/userspec.c
--- src/userspec.c.orig	2005-05-19 11:25:58 +0200
+++ src/userspec.c	2006-10-24 13:18:23 +0200
@@ -22,6 +22,7 @@
 #include <system.h>
 
 #ifdef __GNUC__
+#undef  alloca
 #define alloca __builtin_alloca
 #else
 #ifdef HAVE_ALLOCA_H