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

 {"ISO8859-1",iso1_tbl},
 {"ISO8859-2",iso2_tbl},
 {"ISO8859-3",iso3_tbl},
--- misc/hunspell-1.1.12/src/hunspell/csutil.hxx	2007-09-02 02:04:00.000000000 +0200
+++ misc/build/hunspell-1.1.12/src/hunspell/csutil.hxx	2008-06-11 19:00:13.817528000 +0200
@@ -21,7 +21,11 @@
 // default flags
 #define ONLYUPCASEFLAG 65535
 
+#ifdef WIN32
 typedef struct {
+#else
+typedef struct __attribute__ ((packed)) {
+#endif
     unsigned char l;
     unsigned char h;

 # DIC2BIN= \
 #	en_US.aff \
--- misc/hunspell-1.1.12/src/hunspell/phonet.cxx	Mon Aug 27 21:45:49 2007
+++ misc/build/hunspell-1.1.12/src/hunspell/phonet.cxx	Tue Jun 17 12:51:33 2008
@@ -32,6 +32,7 @@
 #include <cstring>
 #include <cstdio>
 #include <cctype>
