[Pkg-ocaml-maint-commits] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 65055af89b4cec2d05dcc061180dee4679f1d102
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Sat Dec 1 18:41:14 2012 +0100

    Add patch to fix some includes.

diff --git a/debian/patches/fix_mlvalues.h_path.diff b/debian/patches/fix_mlvalues.h_path.diff
new file mode 100644
index 0000000..fc3192b
--- /dev/null
+++ b/debian/patches/fix_mlvalues.h_path.diff
@@ -0,0 +1,53 @@
+--- a/EXTRA/does-process-exist-c-wrapper.c
++++ b/EXTRA/does-process-exist-c-wrapper.c
+@@ -24,10 +24,10 @@
+ #include <assert.h>
+ 
+ #include <memory.h>
+-#include <mlvalues.h>
++#include <caml/mlvalues.h>
+ /* If I don't #include caml/alloc.h then this module compiles fine, but then crashes
+    at runtime. Funny, isn't it? */
+-#include <alloc.h>
++#include <caml/alloc.h>
+ 
+ /* Return true iff the process identified by the given pid exists. The idea is just to
+    call kill with 0 as a signal, which is easy in C but impossible in OCaml: */
+--- a/EXTRA/waitpid-c-wrapper.c
++++ b/EXTRA/waitpid-c-wrapper.c
+@@ -22,12 +22,12 @@
+ #include <errno.h>
+ #include <assert.h>
+ 
+-#include <mlvalues.h>
+-#include <alloc.h>
+-#include <memory.h>
+-#include <fail.h>
+-#include <callback.h>
+-#include <unixsupport.h>
++#include <caml/mlvalues.h>
++#include <caml/alloc.h>
++#include <caml/memory.h>
++#include <caml/fail.h>
++#include <caml/callback.h>
++#include <caml/unixsupport.h>
+ 
+ #define WAITPID_NAME "waitpid"
+ 
+--- a/GETTEXT/gettext-c-wrapper.c
++++ b/GETTEXT/gettext-c-wrapper.c
+@@ -22,11 +22,11 @@
+ #include <stdbool.h>
+ #include <libintl.h>
+ 
+-#include <mlvalues.h>
++#include <caml/mlvalues.h>
+ /* If I don't #include caml/alloc.h then this module compiles fine, but then crashes
+    at runtime. Funny, isn't it? */
+-#include <alloc.h>
+-#include <memory.h>
++#include <caml/alloc.h>
++#include <caml/memory.h>
+ 
+ /* Some part of the gettext initialization should only be performed once: */
+ static bool was_gettext_initialized = false;
diff --git a/debian/patches/series b/debian/patches/series
index 15bef37..af38ad9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_adapt_debian.diff
+fix_mlvalues.h_path.diff

-- 
ocamlbricks packaging