Bug 947735 - Build modules/libmar/ in unified mode; r=bbondy

modules/libmar/sign/moz.build

@@ -6,7 +6,7 @@
 
 LIBRARY_NAME = 'signmar'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'mar_sign.c',
     'nss_secutil.c',
 ]

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");

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',

modules/libmar/verify/moz.build

@@ -6,7 +6,7 @@
 
 LIBRARY_NAME = 'verifymar'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'cryptox.c',
     'mar_verify.c',
 ]