[Pkg-ocaml-maint-commits] [ocaml-ctypes] 01/02: Missing return in ffi_return_type_adjustment

Stéphane Glondu glondu at moszumanska.debian.org
Wed Jun 22 07:38:40 UTC 2016


This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-ctypes.

commit 7a62a319d7b1978e06fe125be8876f7083e502dc
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jun 22 09:34:01 2016 +0200

    Missing return in ffi_return_type_adjustment
---
 ...sing-return-in-ffi_return_type_adjustment.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/0004-Missing-return-in-ffi_return_type_adjustment.patch b/debian/patches/0004-Missing-return-in-ffi_return_type_adjustment.patch
new file mode 100644
index 0000000..543ff3d
--- /dev/null
+++ b/debian/patches/0004-Missing-return-in-ffi_return_type_adjustment.patch
@@ -0,0 +1,22 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Wed, 22 Jun 2016 09:33:31 +0200
+Subject: Missing return in ffi_return_type_adjustment
+
+Bug: https://github.com/ocamllabs/ocaml-ctypes/issues/404
+---
+ src/ctypes-foreign-base/ffi_call_stubs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ctypes-foreign-base/ffi_call_stubs.c b/src/ctypes-foreign-base/ffi_call_stubs.c
+index 6a0090f..3d92aeb 100644
+--- a/src/ctypes-foreign-base/ffi_call_stubs.c
++++ b/src/ctypes-foreign-base/ffi_call_stubs.c
+@@ -283,7 +283,7 @@ static int ffi_return_type_adjustment(ffi_type *f)
+   /* An adjustment is needed (on bigendian systems) for integer types
+      less than the size of a word */
+   if (ffi_return_type_promotes(f)) {
+-    sizeof(ffi_arg) - f->size;
++    return sizeof(ffi_arg) - f->size;
+   }
+ #endif
+   return 0;
diff --git a/debian/patches/series b/debian/patches/series
index e76d4c3..c023a40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-the-same-C-compiler-as-OCaml-to-build-test-stubs.patch
 0002-Fix-for-PowerPC-handle-libffi-s-integer-return-type-.patch
 0003-Initialize-the-return-slot-for-small-return-values-f.patch
+0004-Missing-return-in-ffi_return_type_adjustment.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-ctypes.git



More information about the Pkg-ocaml-maint-commits mailing list