Bug 571728 - Mismatched allocator for SuggestMgr::csconv. r=ehsan r=smaug

extensions/spellcheck/hunspell/src/affixmgr.cpp

@@ -68,10 +68,6 @@
 
 #include "csutil.hxx"
 
-#ifdef MOZILLA_CLIENT
-#include "nscore.h" // for mozalloc headers
-#endif
-
 AffixMgr::AffixMgr(const char * affpath, HashMgr** ptr, int * md, const char * key) 
 {
   // register hash manager and load affix data from aff file

extensions/spellcheck/hunspell/src/csutil.hxx

@@ -66,6 +66,10 @@
 #include "w_char.hxx"
 #include "htypes.hxx"
 
+#ifdef MOZILLA_CLIENT
+#include "nscore.h" // for mozalloc headers
+#endif
+
 // casing
 #define NOCAP   0
 #define INITCAP 1

extensions/spellcheck/hunspell/src/hunspell.cpp

@@ -61,9 +61,7 @@
 
 #include "hunspell.hxx"
 #include "hunspell.h"
-#ifdef MOZILLA_CLIENT
+#ifndef MOZILLA_CLIENT
-#    include "nscore.h"
-#else
 #    include "config.h"
 #endif
 #include "csutil.hxx"

extensions/spellcheck/hunspell/src/suggestmgr.cpp

@@ -64,10 +64,6 @@
 #include "htypes.hxx"
 #include "csutil.hxx"
 
-#ifdef MOZILLA_CLIENT
-#include "nscore.h" // for mozalloc headers
-#endif
-
 const w_char W_VLINE = { '\0', '|' };
 
 SuggestMgr::SuggestMgr(const char * tryme, int maxn,