Bug 939659 - Build spellchecker in unified mode; r=roc

extensions/spellcheck/hunspell/src/moz.build

@@ -6,13 +6,13 @@
 
 MODULE = 'hunspell'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'mozHunspell.cpp',
     'mozHunspellDirProvider.cpp',
 ]
 
 if not CONFIG['MOZ_NATIVE_HUNSPELL']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'affentry.cpp',
         'affixmgr.cpp',
         'csutil.cpp',

extensions/spellcheck/hunspell/src/mozHunspell.cpp

@@ -78,7 +78,6 @@
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 
-static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(mozHunspell)

extensions/spellcheck/src/moz.build

@@ -6,7 +6,7 @@
 
 MODULE = 'spellchecker'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'mozEnglishWordUtils.cpp',
     'mozGenericWordUtils.cpp',
     'mozInlineSpellChecker.cpp',

extensions/spellcheck/src/mozInlineSpellWordUtil.h

@@ -3,6 +3,9 @@
  * 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 mozInlineSpellWordUtil_h
+#define mozInlineSpellWordUtil_h
+
 #include "nsCOMPtr.h"
 #include "nsIDOMDocument.h"
 #include "nsIDocument.h"
@@ -159,3 +162,5 @@ private:
   nsresult MakeRange(NodeOffset aBegin, NodeOffset aEnd, nsRange** aRange);
   nsresult MakeRangeForWord(const RealWord& aWord, nsRange** aRange);
 };
+
+#endif