  
  #ifndef MOZILLA_CLIENT
  #ifndef W32
-@@ -1727,29 +1735,3 @@
+@@ -1727,29 +1739,3 @@
  }
  
  #endif // END OF HUNSPELL_EXPERIMENTAL CODE

+#ifndef MOZILLA_CLIENT
+#include "utf_info.cxx"
+#define UTF_LST_LEN (sizeof(utf_lst) / (sizeof(unicode_info)))
 #endif
+#endif
 
 #ifdef MOZILLA_CLIENT
 #include "nsCOMPtr.h"
@@ -125,7 +125,7 @@
         case 0x90:
         case 0xa0:

     			wlst[nh].word = mystrdup(st);
     			wlst[nh].allow = (1 == 0);
     			wlst[nh].orig = mystrdup(newword);
--- misc/hunspell-1.1.12/src/hunspell/affixmgr.hxx	Fri Aug 31 18:00:04 2007
+++ misc/build/hunspell-1.1.12/src/hunspell/affixmgr.hxx	Fri Aug 22 15:28:42 2008
@@ -2,9 +2,6 @@
 #define _AFFIXMGR_HXX_
 
 #ifdef MOZILLA_CLIENT
-#ifdef __SUNPRO_CC // for SunONE Studio compiler
-using namespace std;
-#endif
 #include <stdio.h>
 #else
 #include <cstdio>
--- misc/hunspell-1.1.12/src/hunspell/atypes.hxx	Sat Sep  1 08:57:35 2007
+++ misc/build/hunspell-1.1.12/src/hunspell/atypes.hxx	Mon Jun 16 15:50:27 2008
@@ -1,6 +1,8 @@
