[Pkg-ocaml-maint-commits] [SCM] apron packaging branch, master, updated. debian/0.9.10-4-6-g32898f5

[Laurent Fousse]

The following commit has been merged in the master branch:
commit ce1c5baa82716b9dd1610baff910226ddfbcdce0
Author: Laurent Fousse <laurent at komite.net>
Date:   Mon Jul 19 11:16:50 2010 +0200

    Add rounding_mode.diff (#589359).

diff --git a/debian/changelog b/debian/changelog
index 03ee817..11ce05a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 apron (0.9.10-5) UNRELEASED; urgency=low
 
-  * Add mpfr_random.diff (Closes: #589359)
+  * Add mpfr_random.diff and rounding_modes.diff (Closes: #589359)
 
  -- Stéphane Glondu <glondu at debian.org>  Sat, 17 Jul 2010 11:44:23 +0200
 
diff --git a/debian/patches/rounding_modes.diff b/debian/patches/rounding_modes.diff
new file mode 100644
index 0000000..76d4798
--- /dev/null
+++ b/debian/patches/rounding_modes.diff
@@ -0,0 +1,33 @@
+From f1c6209c44883343b05ad625d5d97d90f8a322cd Mon Sep 17 00:00:00 2001
+From: Laurent Fousse <laurent at komite.net>
+Date: Mon, 19 Jul 2010 10:57:25 +0200
+Subject: [PATCH] Fix rounding mode check in assert.
+
+---
+ mlgmpidl/gmp_caml.h |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/mlgmpidl/gmp_caml.h b/mlgmpidl/gmp_caml.h
+index 15ca41c..0b3468a 100644
+--- a/mlgmpidl/gmp_caml.h
++++ b/mlgmpidl/gmp_caml.h
+@@ -46,10 +46,14 @@ void camlidl_mpfr_ptr_ml2c(value val, mpfr_ptr* mpf);
+ void camlidl_mpfr_ml2c(value val, __mpfr_struct* mpf);
+ static inline
+ value camlidl_mpfr_rnd_t_c2ml(mpfr_rnd_t* rnd)
+-{ assert(*rnd>=0 && *rnd<GMP_RND_MAX); return Val_int(*rnd); }
++{ assert((*rnd == MPFR_RNDN) || (*rnd == MPFR_RNDZ) || 
++	 (*rnd == MPFR_RNDU) || (*rnd == MPFR_RNDD) ||
++	 (*rnd == MPFR_RNDA)); return Val_int(*rnd); }
+ static inline
+ void camlidl_mpfr_rnd_t_ml2c(value val, mpfr_rnd_t* rnd)
+-{ *rnd = Int_val(val); assert(*rnd>=0 && *rnd<GMP_RND_MAX); }
++{ *rnd = Int_val(val); assert((*rnd == MPFR_RNDN) || (*rnd == MPFR_RNDZ) || 
++			      (*rnd == MPFR_RNDU) || (*rnd == MPFR_RNDD) ||
++			      (*rnd == MPFR_RNDA)); }
+ #endif
+ #endif
+ 
+-- 
+1.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index bdfe204..d7e9407 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ nonopt.diff
 link
 oct_static
 mpfr_random.diff
+rounding_modes.diff

-- 
apron packaging