From b3d8e747952e4f0aea19a1f9537d3ff164f0c8f0 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 25 Nov 2013 15:44:25 -0500
Subject: [PATCH] Bug 942486 - Move PL_ARENA_CONST_ALIGN_MASK out of
 nsZipArchive.h; r=mwu

--HG--
extra : rebase_source : 92410d30a1f8ae6d9df4fb6e6b278dc6307460a0
---
 modules/libjar/nsZipArchive.cpp | 5 +++++
 modules/libjar/nsZipArchive.h   | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/libjar/nsZipArchive.cpp b/modules/libjar/nsZipArchive.cpp
index e4bdc86a4ce..c6452ac8fd9 100644
--- a/modules/libjar/nsZipArchive.cpp
+++ b/modules/libjar/nsZipArchive.cpp
@@ -10,6 +10,11 @@
  * or pointers to it across thread boundaries.
  */
 
+// This must be the first include in the file in order for the
+// PL_ARENA_CONST_ALIGN_MASK macro to be effective.
+#define PL_ARENA_CONST_ALIGN_MASK  (sizeof(void*)-1)
+#include "plarena.h"
+
 #define READTYPE  int32_t
 #include "zlib.h"
 #include "nsISupportsUtils.h"
diff --git a/modules/libjar/nsZipArchive.h b/modules/libjar/nsZipArchive.h
index cb39e31f013..2ef7819bd2c 100644
--- a/modules/libjar/nsZipArchive.h
+++ b/modules/libjar/nsZipArchive.h
@@ -11,11 +11,7 @@
 #define ZIP_TABSIZE   256
 #define ZIP_BUFLEN    (4*1024)      /* Used as output buffer when deflating items to a file */
 
-#ifndef PL_ARENA_CONST_ALIGN_MASK
-#define PL_ARENA_CONST_ALIGN_MASK  (sizeof(void*)-1)
-#endif
 #include "plarena.h"
-
 #include "zlib.h"
 #include "zipstruct.h"
 #include "nsAutoPtr.h"