4 files changed, 22 insertions, 11 deletions
diff --git a/chrome/SConscript b/chrome/SConscript
index 3775688..2ff2347 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -430,6 +430,7 @@ env.SConscript(test_sconscript_files, exports=['env_test'])
 sconscript_files = [
     'browser/SConscript',
     'common/SConscript',
+    'third_party/hunspell/SConscript',
     '$THIRD_PARTY_DIR/sqlite/SConscript',
 ]
 
@@ -460,7 +461,6 @@ if env['PLATFORM'] == 'win32':
       'tools/crash_service/SConscript',
       'tools/perf/flush_cache/SConscript',
       'tools/test/image_diff/SConscript',
-      'third_party/hunspell/SConscript',
       'views/SConscript',
   ])
 
diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript
index d55c592..0162dad 100644
--- a/chrome/third_party/hunspell/SConscript
+++ b/chrome/third_party/hunspell/SConscript
@@ -42,18 +42,33 @@ env.Prepend(
 
 env.Append(
     CPPDEFINES = [
-        'W32',
         'OPENOFFICEORG',
         'CHROME_SPELL',
         'HUNSPELL_CHROME_CLIENT',
     ],
+)
 
-    CCFLAGS = [
-        '/TP',
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CPPDEFINES = [
+          'W32',
+      ], 
+      CCFLAGS = [
+          '/TP',
 
-        '/wd4800',
-    ],
-)
+          '/wd4800',
+      ],
+  )
+
+if env['PLATFORM'] == 'posix':
+  env.Append(
+      CCFLAGS = [
+          '-Wno-parentheses',
+          '-Wno-unused-value',
+          '-Wno-unused-variable',
+          '-Wno-write-strings',
+      ],
+  )
 
 input_files = [
     'google/bdict_reader.cc',
diff --git a/chrome/third_party/hunspell/src/hunspell/affixmgr.cxx b/chrome/third_party/hunspell/src/hunspell/affixmgr.cxx
index e21db6b..ac76ec2 100644
--- a/chrome/third_party/hunspell/src/hunspell/affixmgr.cxx
+++ b/chrome/third_party/hunspell/src/hunspell/affixmgr.cxx
@@ -13,8 +13,6 @@
 #include <ctype.h>
 #endif
 
-#include <io.h>
-
 #include "affixmgr.hxx"
 #include "affentry.hxx"
 #include "langnum.hxx"
diff --git a/chrome/third_party/hunspell/src/hunspell/hashmgr.cxx b/chrome/third_party/hunspell/src/hunspell/hashmgr.cxx
index 51c054f..daa4247 100644
--- a/chrome/third_party/hunspell/src/hunspell/hashmgr.cxx
+++ b/chrome/third_party/hunspell/src/hunspell/hashmgr.cxx
@@ -13,8 +13,6 @@
 #include <ctype.h>
 #endif
 
-#include <io.h>
-
 #include "hashmgr.hxx"
 #include "csutil.hxx"
 #include "atypes.hxx"