[tor-commits] [tor-messenger-build/master] Add a patch for bug 1167248

[arlo@xxxxxxxxxxxxxx]

commit 64bc03c695b2ebb1308aa69b5ce53eeaad149afe
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Thu Mar 24 16:27:43 2016 -0700

    Add a patch for bug 1167248
---
 projects/instantbird/bug-1167248.mozpatch | 22 ++++++++++++++++++++++
 projects/instantbird/config               |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/projects/instantbird/bug-1167248.mozpatch b/projects/instantbird/bug-1167248.mozpatch
new file mode 100644
index 0000000..2ef5804
--- /dev/null
+++ b/projects/instantbird/bug-1167248.mozpatch
@@ -0,0 +1,22 @@
+From 65aeb7ca6d2b5f55acb35bb8eef3152b613faf1f Mon Sep 17 00:00:00 2001
+From: Jacek Caban <jacek@xxxxxxxxxxxxxxx>
+Date: Thu, 21 Jan 2016 13:40:07 +0100
+Subject: [PATCH] Bug 1167248 - Cross compilation fixup.
+
+---
+ js/src/jsmath.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp
+index 56ba1cf..3f4ddd9 100644
+--- a/js/src/jsmath.cpp
++++ b/js/src/jsmath.cpp
+@@ -44,7 +44,7 @@
+ // "Community Additions" comment on MSDN here:
+ // https://msdn.microsoft.com/en-us/library/windows/desktop/aa387694.aspx
+ # define SystemFunction036 NTAPI SystemFunction036
+-# include <NTSecAPI.h>
++# include <ntsecapi.h>
+ # undef SystemFunction036
+ #endif
+ 
diff --git a/projects/instantbird/config b/projects/instantbird/config
index df73d5a..d9e0646 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -109,6 +109,8 @@ input_files:
     enable: '[% c("var/windows") %]'
   - filename: bug-1240589.mozpatch
     enable: '[% c("var/windows") %]'
+  - filename: bug-1167248.mozpatch
+    enable: '[% c("var/windows") %]'
   - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
   - filename: trac-16475.mozpatch
   - filename: OSX-package-as-tar.bz2.mozpatch

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits