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.

115 lines
3.6 KiB

  1. diff -dur xine-lib-1-rc6a/src/input/input_cdda.c xine-lib-1-rc6a-p/src/input/input_cdda.c
  2. --- xine-lib-1-rc6a/src/input/input_cdda.c 2004-09-07 22:48:11.000000000 +0000
  3. +++ xine-lib-1-rc6a-p/src/input/input_cdda.c 2004-10-26 00:07:21.000000000 +0000
  4. @@ -382,6 +382,19 @@
  5. #if defined (__linux__)
  6. +
  7. +#ifdef __CHECKER__
  8. +#define __bitwise __attribute__((bitwise))
  9. +#else
  10. +#define __bitwise
  11. +#endif
  12. +#define __le16 __bitwise __u16
  13. +#define __be16 __bitwise __u16
  14. +#define __le32 __bitwise __u32
  15. +#define __be32 __bitwise __u32
  16. +#define __le64 __bitwise __u64
  17. +#define __be64 __bitwise __u64
  18. +
  19. #include <linux/cdrom.h>
  20. static int read_cdrom_toc(int fd, cdrom_toc *toc) {
  21. diff -dur xine-lib-1-rc6a/src/input/input_dvd.c xine-lib-1-rc6a-p/src/input/input_dvd.c
  22. --- xine-lib-1-rc6a/src/input/input_dvd.c 2004-09-16 13:57:37.000000000 +0000
  23. +++ xine-lib-1-rc6a-p/src/input/input_dvd.c 2004-10-26 00:03:01.000000000 +0000
  24. @@ -69,6 +69,19 @@
  25. #include <sys/dvdio.h>
  26. #include <sys/cdio.h> /* CDIOCALLOW etc... */
  27. #elif defined(HAVE_LINUX_CDROM_H)
  28. +
  29. +#ifdef __CHECKER__
  30. +#define __bitwise __attribute__((bitwise))
  31. +#else
  32. +#define __bitwise
  33. +#endif
  34. +#define __le16 __bitwise __u16
  35. +#define __be16 __bitwise __u16
  36. +#define __le32 __bitwise __u32
  37. +#define __be32 __bitwise __u32
  38. +#define __le64 __bitwise __u64
  39. +#define __be64 __bitwise __u64
  40. +
  41. #include <linux/cdrom.h>
  42. #elif defined(HAVE_SYS_CDIO_H)
  43. #include <sys/cdio.h>
  44. diff -dur xine-lib-1-rc6a/src/input/input_vcd.c xine-lib-1-rc6a-p/src/input/input_vcd.c
  45. --- xine-lib-1-rc6a/src/input/input_vcd.c 2004-07-24 01:22:17.000000000 +0000
  46. +++ xine-lib-1-rc6a-p/src/input/input_vcd.c 2004-10-26 00:04:34.000000000 +0000
  47. @@ -34,6 +34,19 @@
  48. #include <sys/ioctl.h>
  49. #include <string.h>
  50. #ifdef HAVE_LINUX_CDROM_H
  51. +
  52. +#ifdef __CHECKER__
  53. +#define __bitwise __attribute__((bitwise))
  54. +#else
  55. +#define __bitwise
  56. +#endif
  57. +#define __le16 __bitwise __u16
  58. +#define __be16 __bitwise __u16
  59. +#define __le32 __bitwise __u32
  60. +#define __be32 __bitwise __u32
  61. +#define __le64 __bitwise __u64
  62. +#define __be64 __bitwise __u64
  63. +
  64. # include <linux/cdrom.h>
  65. #endif
  66. #ifdef HAVE_SYS_CDIO_H
  67. diff -dur xine-lib-1-rc6a/src/input/media_helper.c xine-lib-1-rc6a-p/src/input/media_helper.c
  68. --- xine-lib-1-rc6a/src/input/media_helper.c 2004-09-03 16:02:05.000000000 +0000
  69. +++ xine-lib-1-rc6a-p/src/input/media_helper.c 2004-10-26 00:04:01.000000000 +0000
  70. @@ -39,6 +39,19 @@
  71. #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
  72. #include <sys/cdio.h> /* CDIOCALLOW etc... */
  73. #elif defined(HAVE_LINUX_CDROM_H)
  74. +
  75. +#ifdef __CHECKER__
  76. +#define __bitwise __attribute__((bitwise))
  77. +#else
  78. +#define __bitwise
  79. +#endif
  80. +#define __le16 __bitwise __u16
  81. +#define __be16 __bitwise __u16
  82. +#define __le32 __bitwise __u32
  83. +#define __be32 __bitwise __u32
  84. +#define __le64 __bitwise __u64
  85. +#define __be64 __bitwise __u64
  86. +
  87. #include <linux/cdrom.h>
  88. #elif defined(HAVE_SYS_CDIO_H)
  89. #include <sys/cdio.h>
  90. diff -dur xine-lib-1-rc6a/src/input/vcd/libcdio/_cdio_linux.c xine-lib-1-rc6a-p/src/input/vcd/libcdio/_cdio_linux.c
  91. --- xine-lib-1-rc6a/src/input/vcd/libcdio/_cdio_linux.c 2004-04-12 02:03:08.000000000 +0000
  92. +++ xine-lib-1-rc6a-p/src/input/vcd/libcdio/_cdio_linux.c 2004-10-25 23:25:28.000000000 +0000
  93. @@ -57,6 +57,19 @@
  94. #include <fcntl.h>
  95. #include <mntent.h>
  96. +
  97. +#ifdef __CHECKER__
  98. +#define __bitwise __attribute__((bitwise))
  99. +#else
  100. +#define __bitwise
  101. +#endif
  102. +#define __le16 __bitwise __u16
  103. +#define __be16 __bitwise __u16
  104. +#define __le32 __bitwise __u32
  105. +#define __be32 __bitwise __u32
  106. +#define __le64 __bitwise __u64
  107. +#define __be64 __bitwise __u64
  108. +
  109. #include <linux/cdrom.h>
  110. #include <scsi/scsi.h>
  111. #include <scsi/sg.h>