mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

66 lines
1.7 KiB

  1. --- ./silo/silo.c.orig 2004-11-24 20:02:18.884240368 +0100
  2. +++ ./silo/silo.c 2004-11-24 20:02:44.857291864 +0100
  3. @@ -49,6 +49,11 @@
  4. # define _LINUX_STRING_H_
  5. #endif
  6. #ifdef __linux__
  7. +/* for linux-2.6.9, from linux/types.h */
  8. +# include <asm/types.h>
  9. +# ifndef pgoff_t
  10. +# define pgoff_t unsigned long
  11. +# endif
  12. # include <linux/fs.h>
  13. # include <ext2fs/ext2_fs.h>
  14. # include <ext2fs/ext2fs.h>
  15. --- ./silo/silocheck.c.orig 2004-11-24 20:03:04.171355680 +0100
  16. +++ ./silo/silocheck.c 2004-11-24 20:03:21.014795088 +0100
  17. @@ -35,6 +35,11 @@
  18. # define _LINUX_STRING_H_
  19. #endif
  20. #ifdef __linux__
  21. +/* for linux-2.6.9, from linux/types.h */
  22. +# include <asm/types.h>
  23. +# ifndef pgoff_t
  24. +# define pgoff_t unsigned long
  25. +# endif
  26. # include <linux/fs.h>
  27. # include <ext2fs/ext2_fs.h>
  28. # include <ext2fs/ext2fs.h>
  29. --- ./second/fs/romfs.c.orig 2004-11-24 19:59:31.633666320 +0100
  30. +++ ./second/fs/romfs.c 2004-11-24 19:59:42.377033080 +0100
  31. @@ -25,6 +25,20 @@
  32. #include <silo.h>
  33. #include <file.h>
  34. #include <stringops.h>
  35. +
  36. +#ifdef __CHECKER__
  37. +#define __bitwise __attribute__((bitwise))
  38. +#else
  39. +#define __bitwise
  40. +#endif
  41. +
  42. +typedef __u16 __bitwise __le16;
  43. +typedef __u16 __bitwise __be16;
  44. +typedef __u32 __bitwise __le32;
  45. +typedef __u32 __bitwise __be32;
  46. +typedef __u64 __bitwise __le64;
  47. +typedef __u64 __bitwise __be64;
  48. +
  49. #include <linux/romfs_fs.h>
  50. /* Reuse and abuse */
  51. --- ./second/fs/ufs.c.orig 2004-11-24 20:01:10.061702984 +0100
  52. +++ ./second/fs/ufs.c 2004-11-24 20:01:34.434997680 +0100
  53. @@ -33,6 +33,12 @@
  54. struct inode { unsigned int blah; };
  55. +/* for linux-2.6.9, from linux/types.h */
  56. +#include <asm/types.h>
  57. +#ifndef pgoff_t
  58. +#define pgoff_t unsigned long
  59. +#endif
  60. +
  61. #include <linux/ufs_fs.h>
  62. /* Reuse and abuse */