diff -Naru aspell-0.61-20071105/common/string.hpp aspell-0.61-20071105-patched/common/string.hpp
--- aspell-0.61-20071105/common/string.hpp	2007-10-20 06:52:49.000000000 +0200
+++ aspell-0.61-20071105-patched/common/string.hpp	2008-04-05 18:45:09.000000000 +0300
@@ -496,7 +496,7 @@
 
 namespace std
 {
-  template<> static inline void swap(aspell::String & x, aspell::String & y) {x.swap(y);}
+  template<> inline void swap(aspell::String & x, aspell::String & y) {x.swap(y);}
 }
 
 #endif
diff -Naru aspell-0.61-20071105/lib/munch_list.cpp aspell-0.61-20071105-patched/lib/munch_list.cpp
--- aspell-0.61-20071105/lib/munch_list.cpp	2007-10-18 06:14:56.000000000 +0200
+++ aspell-0.61-20071105-patched/lib/munch_list.cpp	2008-04-05 18:44:41.000000000 +0300
@@ -49,7 +49,7 @@
   typedef CML_Entry Value;
   typedef const char * Key;
   static const bool is_multi = true;
-  hash<const char *> hash;
+  struct hash<const char *> hash;
   bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
   Key key(const Value & v) {return v.word;}
 };
diff -Naru aspell-0.61-20071105/modules/speller/default/affix.cpp aspell-0.61-20071105-patched/modules/speller/default/affix.cpp
--- aspell-0.61-20071105/modules/speller/default/affix.cpp	2007-10-24 10:14:15.000000000 +0200
+++ aspell-0.61-20071105-patched/modules/speller/default/affix.cpp	2008-04-05 18:44:01.000000000 +0300
@@ -194,7 +194,7 @@
   typedef const Conds * Value;
   typedef const char * Key;
   static const bool is_multi = false;
-  hash<const char *> hfun;
+  struct  hash<const char *> hfun;
   size_t hash(const char * s) {return hfun(s);}
   bool equal(const char * x, const char * y) {return strcmp(x,y) == 0;}
   const char * key(const Conds * c) {return c->str;}