From a4c3a2ef682c286ee4d2e963491f08438f526725 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 9 Dec 2013 13:30:27 -0500
Subject: [PATCH] Bug 947735 - Build modules/libmar/ in unified mode; r=bbondy

---
 modules/libmar/sign/moz.build   | 2 +-
 modules/libmar/src/mar_read.c   | 6 +++---
 modules/libmar/src/moz.build    | 2 +-
 modules/libmar/verify/moz.build | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/libmar/sign/moz.build b/modules/libmar/sign/moz.build
index 6cfbe7da40ba..dc6d69052d8b 100644
--- a/modules/libmar/sign/moz.build
+++ b/modules/libmar/sign/moz.build
@@ -6,7 +6,7 @@
 
 LIBRARY_NAME = 'signmar'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'mar_sign.c',
     'nss_secutil.c',
 ]
diff --git a/modules/libmar/src/mar_read.c b/modules/libmar/src/mar_read.c
index cfa2bad7f396..eddcc0846c39 100644
--- a/modules/libmar/src/mar_read.c
+++ b/modules/libmar/src/mar_read.c
@@ -547,10 +547,10 @@ int mar_read(MarFile *mar, const MarItem *item, int offset, char *buf,
  */
 int get_mar_file_info(const char *path, 
                       int *hasSignatureBlock,
-                      int *numSignatures,
+                      uint32_t *numSignatures,
                       int *hasAdditionalBlocks,
-                      int *offsetAdditionalBlocks,
-                      int *numAdditionalBlocks)
+                      uint32_t *offsetAdditionalBlocks,
+                      uint32_t *numAdditionalBlocks)
 {
   int rv;
   FILE *fp = fopen(path, "rb");
diff --git a/modules/libmar/src/moz.build b/modules/libmar/src/moz.build
index 3c3f5be63bdb..a722e95482b2 100644
--- a/modules/libmar/src/moz.build
+++ b/modules/libmar/src/moz.build
@@ -18,7 +18,7 @@ HOST_LIBRARY_NAME = 'hostmar'
 
 LIBRARY_NAME = 'mar'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'mar_create.c',
     'mar_extract.c',
     'mar_read.c',
diff --git a/modules/libmar/verify/moz.build b/modules/libmar/verify/moz.build
index 346da9844105..e126a870d749 100644
--- a/modules/libmar/verify/moz.build
+++ b/modules/libmar/verify/moz.build
@@ -6,7 +6,7 @@
 
 LIBRARY_NAME = 'verifymar'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'cryptox.c',
     'mar_verify.c',
 ]