vdr/vdr-plugin-bitstreamout/debian/patches 01_FTBFS-fix.dpatch
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Fri, 16 Jul 2004 14:58:03 +0000
Update of /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/debian/patches
In directory haydn:/tmp/cvs-serv30877/vdr/vdr-plugin-bitstreamout/debian/patches
Modified Files:
01_FTBFS-fix.dpatch
Log Message:
added test_and_set_bit and test_and_clear_bit-methods from <asm/bitops.h> as c-code (thanks to Christoph Martin)
Index: 01_FTBFS-fix.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/debian/patches/01_FTBFS-fix.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 01_FTBFS-fix.dpatch 10 Jul 2004 12:59:09 -0000 1.1
+++ 01_FTBFS-fix.dpatch 16 Jul 2004 14:58:01 -0000 1.2
@@ -23,9 +23,9 @@
exit 0
@DPATCH@
-diff -urNad /home/chelli/vdr/cvs/vdr/vdr-plugin-bitstreamout/types.h vdr-plugin-bitstreamout/types.h
---- /home/chelli/vdr/cvs/vdr/vdr-plugin-bitstreamout/types.h 2004-06-16 17:44:43.000000000 +0200
-+++ vdr-plugin-bitstreamout/types.h 2004-07-10 14:56:19.000000000 +0200
+diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-bitstreamout/vdr-plugin-bitstreamout-0.61b/types.h vdr-plugin-bitstreamout-0.61b/types.h
+--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-bitstreamout/vdr-plugin-bitstreamout-0.61b/types.h 2004-07-16 16:53:12.000000000 +0200
++++ vdr-plugin-bitstreamout-0.61b/types.h 2004-07-16 16:53:33.000000000 +0200
@@ -26,7 +26,6 @@
#include <sys/mman.h>
#include <asm/types.h>
@@ -34,7 +34,7 @@
#ifndef AARONS_TYPES
#define AARONS_TYPES
-@@ -64,6 +63,11 @@
+@@ -64,6 +63,27 @@
#define SPDIF_SAMPLE_MAGIC B2F(8) // 64 bits are required for IEC60958 magic
#define SPDIF_SAMPLE_ALIGN(x) (((x)+(SPDIF_SAMPLE_MAGIC-1))&~(SPDIF_SAMPLE_MAGIC-1))
@@ -42,6 +42,22 @@
+#define clear_bit(n,addr) (*(addr) &= ~(1 << (n)))
+#define set_bit(n,addr) (*(addr) |= (1 << (n)))
+#define test_bit(n,addr) (*(addr) & (1 << (n)))
++
++int inline test_and_set_bit( int n, volatile void *a )
++{
++ int *addr = (int *)a;
++ int result = test_bit(n, addr);
++ set_bit(n, addr);
++ return result;
++}
++
++int inline test_and_clear_bit( int n, volatile void *a )
++{
++ int *addr = (int *)a;
++ int result = test_bit(n, addr);
++ clear_bit(n, addr);
++ return result;
++}
+
#ifndef DEBUG
# include <linux/rtc.h>