Index: source/spellcheck/hunspell/affixmgr.cxx
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/hunspell/affixmgr.cxx,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- source/spellcheck/hunspell/affixmgr.cxx	19 Jun 2006 23:56:00 -0000	1.4
+++ source/spellcheck/hunspell/affixmgr.cxx	30 Jun 2006 11:55:18 -0000	1.4.4.1
@@ -3898,7 +3898,7 @@
                           np++;
                           if (nptr->contclass) {
                             fprintf(stderr, "error: affix rule contains two contclass "
-                            "(%s and %s by deprecated syntax).\n", nptr->contclass, piece);
+                            "(%p and %s by deprecated syntax).\n", nptr->contclass, piece);
                           } else {
                             if (pHMgr->is_aliasf()) {
                                 int index = atoi(piece);
Index: source/spellcheck/hunspell/hashmgr.cxx
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/hunspell/hashmgr.cxx,v
retrieving revision 1.3
retrieving revision 1.3.14.1
diff -u -r1.3 -r1.3.14.1
--- source/spellcheck/hunspell/hashmgr.cxx	9 Feb 2006 17:01:30 -0000	1.3
+++ source/spellcheck/hunspell/hashmgr.cxx	30 Jun 2006 11:55:19 -0000	1.3.14.1
@@ -257,7 +257,7 @@
     // "\/" signs slash in words (not affix separator)
     // "/" at beginning of the line is word character (not affix separator)
     ap = ts;
-    while (ap = strchr(ap,'/')) {
+    while ((ap = strchr(ap,'/'))) {
         if (ap == ts) {
             ap++;
             continue;
Index: source/spellcheck/hunspell/hunspell.cxx
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/hunspell/hunspell.cxx,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- source/spellcheck/hunspell/hunspell.cxx	19 Jun 2006 23:56:26 -0000	1.4
+++ source/spellcheck/hunspell/hunspell.cxx	30 Jun 2006 11:55:19 -0000	1.4.4.1
@@ -308,10 +308,10 @@
         hentry * h;
         *pos = '�';
         *(pos + 1) = '�';
-        if (h = spellsharps(base, pos + 2, n + 1, repnum + 1, tmp)) return h;
+        if ((h = spellsharps(base, pos + 2, n + 1, repnum + 1, tmp))) return h;
         *pos = 's';
         *(pos + 1) = 's';
-        if (h = spellsharps(base, pos + 2, n + 1, repnum, tmp)) return h;
+        if ((h = spellsharps(base, pos + 2, n + 1, repnum, tmp))) return h;
     } else if (repnum > 0) {
         if (utf8) return check(base);
         return check(sharps_u8_l1(tmp, base));
@@ -458,7 +458,7 @@
     char * s;
     char r;
     for (int j = 0; j < pAMgr->get_numbreak(); j++) {
-      if (s=(char *) strstr(cw, wordbreak[j])) {
+      if ((s=(char *) strstr(cw, wordbreak[j]))) {
         r = *s;
         *s = '\0';
         // examine 2 sides of the break point
@@ -663,8 +663,8 @@
                         }
                         // aNew -> "a New" (instead of "a new")
                         for (int j = prevns; j < ns; j++) {
-                           char * space;
-                           if (space = strchr((*slst)[j],' ')) {
+                           char * space = strchr((*slst)[j],' ');
+                           if (space) {
                                 int slen = strlen(space + 1);
                                 // different case after space (need capitalisation)
                                 if ((slen < wl) && strcmp(cw + wl - slen, space + 1)) {
@@ -696,12 +696,12 @@
                         if (pAMgr && pAMgr->get_checksharps()) {
                             char * pos;
                             if (utf8) {
-                                while (pos = strstr((*slst)[j], "ß")) {
+                                while ((pos = strstr((*slst)[j], "ß"))) {
                                     *pos = 'S';
                                     *(pos+1) = 'S';
                                 }
                             } else {
-                                while (pos = strchr((*slst)[j], '�')) {
+                                while ((pos = strchr((*slst)[j], '�'))) {
                                     (*slst)[j] = (char *) realloc((*slst)[j], strlen((*slst)[j]) + 2);
                                     mystrrep((*slst)[j], "�", "SS");
                                 }
