[Pkg-ocaml-maint-commits] [nss-passwords] 01/01: Fix compilation with OCaml 4.02.2

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository nss-passwords.

commit 6794f9a0e8c43f6d134c8c3ed5a774bc803c0616
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jun 26 15:45:46 2015 +0200

    Fix compilation with OCaml 4.02.2
---
 debian/changelog                                   |  6 ++++++
 .../0001-Fix-compilation-with-OCaml-4.02.2.patch   | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c2bc018..cc988a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nss-passwords (0.2-2) UNRELEASED; urgency=medium
+
+  * Fix compilation with OCaml 4.02.2
+
+ -- Stéphane Glondu <glondu at debian.org>  Fri, 26 Jun 2015 15:46:12 +0200
+
 nss-passwords (0.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/0001-Fix-compilation-with-OCaml-4.02.2.patch b/debian/patches/0001-Fix-compilation-with-OCaml-4.02.2.patch
new file mode 100644
index 0000000..6d5f5b1
--- /dev/null
+++ b/debian/patches/0001-Fix-compilation-with-OCaml-4.02.2.patch
@@ -0,0 +1,24 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Fri, 26 Jun 2015 15:43:56 +0200
+Subject: Fix compilation with OCaml 4.02.2
+
+Define NO_NSPR_10_SUPPORT so that int64 and uint64 (declared by OCaml)
+are not declared by NSPR.
+---
+ nss_stubs.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/nss_stubs.c b/nss_stubs.c
+index 4cffa71..7494939 100644
+--- a/nss_stubs.c
++++ b/nss_stubs.c
+@@ -36,6 +36,8 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
++#define NO_NSPR_10_SUPPORT
++
+ #include <nspr/nspr.h>
+ #include <string.h>
+ #include <nss/nss.h>
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8784d45
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-compilation-with-OCaml-4.02.2.patch

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