      			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 @@

 //    pass in address of array of char * pointers
 // onlycompoundsug: probably bad suggestions (need for ngram sugs, too)
 
--- misc/hunspell-1.1.12/src/tools/hunspell.cxx	2007-07-24 20:47:52.000000000 +0900
+++ misc/build/hunspell-1.1.12/src/tools/hunspell.cxx	2008-06-20 20:06:35.469625000 +0900
@@ -85,8 +85,10 @@
 #if ENABLE_NLS
 #ifdef HAVE_LOCALE_H
 #include <locale.h>

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