[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.0-5-10-g4474bc3

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 3b080a7fdfb5653f6a36a123b4e9be996a00f97d
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Jan 9 11:32:36 2010 +0100

    Remove fix_ARCH_ALIGN_INT64.dpatch: integrated upstream.

diff --git a/debian/changelog b/debian/changelog
index 2b87771..8dc2c26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ocaml-bitstring (2.0.2-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #564222)
+    + Remove fix_ARCH_ALIGN_INT64.dpatch: integrated upstream.
   * Add myself to uploaders.
   * Remove DMUA flag, not needed anymore.
 
diff --git a/debian/patches/fix_ARCH_ALIGN_INT64.dpatch b/debian/patches/fix_ARCH_ALIGN_INT64.dpatch
deleted file mode 100644
index c081957..0000000
--- a/debian/patches/fix_ARCH_ALIGN_INT64.dpatch
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_ARCH_ALIGN_INT64.dpatch by Stephane Glondu <steph at glondu.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix C bindings on ARCH_ALIGN_INT64 architectures (hppa, sparc)
-
- at DPATCH@
---- a/bitstring_c.c
-+++ b/bitstring_c.c
-@@ -86,8 +86,6 @@ fastpath1(16,be,signed,int16_t)
- fastpath1(16,le,signed,int16_t)
- fastpath1(16,ne,signed,int16_t)
- 
--/* XXX This probably doesn't work on ARCH_ALIGN_INT64 platforms. */
--
- #define fastpath2(size,endian,signed,type,rval)				\
-   CAMLprim value							\
-   ocaml_bitstring_extract_fastpath_int##size##_##endian##_##signed	\
-@@ -108,9 +106,32 @@ fastpath2(32,be,signed,int32_t,Int32_val)
- fastpath2(32,le,signed,int32_t,Int32_val)
- fastpath2(32,ne,signed,int32_t,Int32_val)
- 
--fastpath2(64,be,unsigned,uint64_t,Int64_val)
--fastpath2(64,le,unsigned,uint64_t,Int64_val)
--fastpath2(64,ne,unsigned,uint64_t,Int64_val)
--fastpath2(64,be,signed,int64_t,Int64_val)
--fastpath2(64,le,signed,int64_t,Int64_val)
--fastpath2(64,ne,signed,int64_t,Int64_val)
-+/* Special care needs to be taken on ARCH_ALIGN_INT64 platforms
-+   (hppa and sparc in Debian). */
-+
-+#ifdef ARCH_ALIGN_INT64
-+#include <caml/memory.h>
-+#include <caml/alloc.h>
-+#define fastpath3(size,endian,signed,type,rval)				\
-+  CAMLprim value							\
-+  ocaml_bitstring_extract_fastpath_int##size##_##endian##_##signed	\
-+  (value strv, value offv, value rv)					\
-+  {									\
-+    CAMLparam3(strv, offv, rv);						\
-+    type *ptr = (type *) ((void *) String_val (strv) + Int_val (offv));	\
-+    type r;								\
-+    r = *ptr;								\
-+    swap_##endian(size,r);						\
-+    CAMLreturn(caml_copy_int64(r));					\
-+  }
-+
-+#else
-+#define fastpath3 fastpath2
-+#endif
-+
-+fastpath3(64,be,unsigned,uint64_t,Int64_val)
-+fastpath3(64,le,unsigned,uint64_t,Int64_val)
-+fastpath3(64,ne,unsigned,uint64_t,Int64_val)
-+fastpath3(64,be,signed,int64_t,Int64_val)
-+fastpath3(64,le,signed,int64_t,Int64_val)
-+fastpath3(64,ne,signed,int64_t,Int64_val)

-- 
ocaml-bitstring packaging