diff -r 000000000000 -r 6474c204b198 modules/libjar/zipwriter/src/StreamFunctions.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/libjar/zipwriter/src/StreamFunctions.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,68 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef _nsStreamFunctions_h_
+#define _nsStreamFunctions_h_
+
+#include "nscore.h"
+#include "nsIInputStream.h"
+#include "nsIOutputStream.h"
+
+/*
+ * ZIP file data is stored little-endian. These are helper functions to read and
+ * write little endian data to/from a char buffer.
+ * The off argument, where present, is incremented according to the number of
+ * bytes consumed from the buffer.
+ */
+inline NS_HIDDEN_(void) WRITE8(uint8_t* buf, uint32_t* off, uint8_t val)
+{
+  buf[(*off)++] = val;
+}
+
+inline NS_HIDDEN_(void) WRITE16(uint8_t* buf, uint32_t* off, uint16_t val)
+{
+  WRITE8(buf, off, val & 0xff);
+  WRITE8(buf, off, (val >> 8) & 0xff);
+}
+
+inline NS_HIDDEN_(void) WRITE32(uint8_t* buf, uint32_t* off, uint32_t val)
+{
+  WRITE16(buf, off, val & 0xffff);
+  WRITE16(buf, off, (val >> 16) & 0xffff);
+}
+
+inline NS_HIDDEN_(uint8_t) READ8(const uint8_t* buf, uint32_t* off)
+{
+  return buf[(*off)++];
+}
+
+inline NS_HIDDEN_(uint16_t) READ16(const uint8_t* buf, uint32_t* off)
+{
+  uint16_t val = READ8(buf, off);
+  val |= READ8(buf, off) << 8;
+  return val;
+}
+
+inline NS_HIDDEN_(uint32_t) READ32(const uint8_t* buf, uint32_t* off)
+{
+  uint32_t val = READ16(buf, off);
+  val |= READ16(buf, off) << 16;
+  return val;
+}
+
+inline NS_HIDDEN_(uint32_t) PEEK32(const uint8_t* buf)
+{
+  return (uint32_t)( (buf [0]      ) |
+                     (buf [1] <<  8) |
+                     (buf [2] << 16) |
+                     (buf [3] << 24) );
+}
+
+NS_HIDDEN_(nsresult) ZW_ReadData(nsIInputStream *aStream, char *aBuffer, uint32_t aCount);
+
+NS_HIDDEN_(nsresult) ZW_WriteData(nsIOutputStream *aStream, const char *aBuffer,
+                      uint32_t aCount);
+
+#endif