cpio.patch 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970
  1. Index: lib/argp-help.c
  2. --- lib/argp-help.c.orig 2006-09-12 10:59:04 +0200
  3. +++ lib/argp-help.c 2006-10-24 13:29:40 +0200
  4. @@ -567,7 +567,7 @@
  5. return val;
  6. }
  7. -static inline int
  8. +static int
  9. __attribute__ ((always_inline))
  10. hol_entry_long_iterate (const struct hol_entry *entry,
  11. int (*func)(const struct argp_option *opt,
  12. @@ -592,7 +592,7 @@
  13. }
  14. /* Iterator that returns true for the first short option. */
  15. -static inline int
  16. +static int
  17. until_short (const struct argp_option *opt, const struct argp_option *real,
  18. const char *domain, void *cookie)
  19. {
  20. Index: lib/rtapelib.c
  21. --- lib/rtapelib.c.orig 2006-02-20 10:46:01 +0100
  22. +++ lib/rtapelib.c 2006-10-24 13:18:23 +0200
  23. @@ -625,7 +625,7 @@
  24. {
  25. char command_buffer[COMMAND_BUFFER_SIZE];
  26. char operand_buffer[UINTMAX_STRSIZE_BOUND];
  27. - uintmax_t u = offset < 0 ? - (uintmax_t) offset : (uintmax_t) offset;
  28. + unsigned long u = offset < 0 ? - (unsigned long) offset : (unsigned long) offset;
  29. char *p = operand_buffer + sizeof operand_buffer;
  30. *--p = 0;
  31. @@ -667,9 +667,9 @@
  32. {
  33. char command_buffer[COMMAND_BUFFER_SIZE];
  34. char operand_buffer[UINTMAX_STRSIZE_BOUND];
  35. - uintmax_t u = (((struct mtop *) argument)->mt_count < 0
  36. - ? - (uintmax_t) ((struct mtop *) argument)->mt_count
  37. - : (uintmax_t) ((struct mtop *) argument)->mt_count);
  38. + unsigned long u = (((struct mtop *) argument)->mt_count < 0
  39. + ? - (unsigned long) ((struct mtop *) argument)->mt_count
  40. + : (unsigned long) ((struct mtop *) argument)->mt_count);
  41. char *p = operand_buffer + sizeof operand_buffer;
  42. *--p = 0;
  43. Index: lib/system.h
  44. --- lib/system.h.orig 2006-09-08 18:57:52 +0200
  45. +++ lib/system.h 2006-10-24 13:18:23 +0200
  46. @@ -425,7 +425,7 @@
  47. #include <intprops.h>
  48. -#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (uintmax_t)
  49. +#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (unsigned long)
  50. /* Prototypes for external functions. */
  51. Index: src/userspec.c
  52. --- src/userspec.c.orig 2005-05-19 11:25:58 +0200
  53. +++ src/userspec.c 2006-10-24 13:18:23 +0200
  54. @@ -22,6 +22,7 @@
  55. #include <system.h>
  56. #ifdef __GNUC__
  57. +#undef alloca
  58. #define alloca __builtin_alloca
  59. #else
  60. #ifdef HAVE_ALLOCA_H