[patch] Patch to allow hunspell-1.2.8 to build on IRIX

hunspell-1.2.8-irix.patch (text/plain), 4.36 KB, created by Stuart Shelton on 2009-06-30 10:12:05 UTC

--- ./src/hunspell/affixmgr.cxx.dist	2009-06-30 10:06:06.999503480 +0100
+++ ./src/hunspell/affixmgr.cxx	2009-06-30 10:06:33.824382600 +0100
@@ -3234,7 +3234,7 @@ struct hentry * AffixMgr::lookup(const c
 }
 
 // return the value of suffix
-const int AffixMgr::have_contclass()
+int AffixMgr::have_contclass()
 {
   return havecontclass;
 }
@@ -4276,7 +4276,7 @@ int AffixMgr::redundant_condition(char f
             if (strip[i] == cond[j]) in = 1;
           } while ((j < (condl - 1)) && (cond[j] != ']'));
           if (j == (condl - 1) && (cond[j] != ']')) {
-            HUNSPELL_WARNING(stderr, "error: line %d: missing ] in condition:\n%s\n", linenum);
+            HUNSPELL_WARNING(stderr, "error: line %d: missing ] in condition:\n%s\n", linenum, cond);
             return 0;
           }
           if ((!neg && !in) || (neg && in)) {
@@ -4304,7 +4304,7 @@ int AffixMgr::redundant_condition(char f
             if (strip[i] == cond[j]) in = 1;
           } while ((j > 0) && (cond[j] != '['));
           if ((j == 0) && (cond[j] != '[')) {
-            HUNSPELL_WARNING(stderr, "error: error: %d: missing ] in condition:\n%s\n", linenum);
+            HUNSPELL_WARNING(stderr, "error: error: %d: missing ] in condition:\n%s\n", linenum, cond);
             return 0;
           }
           neg = (cond[j+1] == '^') ? 1 : 0;
--- ./src/hunspell/affixmgr.hxx.dist	2009-06-30 10:06:13.136734920 +0100
+++ ./src/hunspell/affixmgr.hxx	2009-06-30 10:06:33.826291720 +0100
@@ -192,7 +192,7 @@ public:
   const char *        get_suffix();
   const char *        get_derived();
   const char *        get_version();
-  const int           have_contclass();
+  int                 have_contclass();
   int                 get_utf8();
   int                 get_complexprefixes();
   char *              get_suffixed(char );
--- ./src/hunspell/filemgr.cxx.dist	2009-06-30 10:06:21.734597400 +0100
+++ ./src/hunspell/filemgr.cxx	2009-06-30 10:06:33.827538360 +0100
@@ -1,14 +1,14 @@
 #include "license.hunspell"
 #include "license.myspell"
 
-#ifndef MOZILLA_CLIENT
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
-#else
+#if defined(MOZILLA_CLIENT) || defined(__sgi)
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#else
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #endif
 
 #include "filemgr.hxx"
--- ./src/hunspell/phonet.cxx.dist	2009-06-30 10:06:30.762711160 +0100
+++ ./src/hunspell/phonet.cxx	2009-06-30 10:06:33.829186600 +0100
@@ -27,16 +27,21 @@
                 Porting from Aspell to Hunspell using C-like structs
 */
 
-#ifndef MOZILLA_CLIENT
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
-#include <cctype>
-#else
+#ifdef MOZILLA_CLIENT
 #include <stdlib.h> 
 #include <string.h>
 #include <stdio.h> 
 #include <ctype.h>
+#elif defined(__sgi)
+#include <cstdlib>
+#include <cstdio>
+#include <string.h>
+#include <ctype.h>
+#else
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <cctype>
 #endif
 
 #include "csutil.hxx"
--- ./src/hunspell/hunzip.cxx.dist	2009-06-30 10:13:44.825050200 +0100
+++ ./src/hunspell/hunzip.cxx	2009-06-30 10:14:21.133909640 +0100
@@ -1,11 +1,11 @@
-#ifndef MOZILLA_CLIENT
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
-#else
+#if defined(MOZILLA_CLIENT) || defined(__sgi)
 #include <stdlib.h> 
 #include <string.h>
 #include <stdio.h> 
+#else
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #endif
 
 #include "hunzip.hxx"
--- ./src/hunspell/replist.cxx.dist	2009-06-30 10:14:47.531152760 +0100
+++ ./src/hunspell/replist.cxx	2009-06-30 10:15:19.958249400 +0100
@@ -1,14 +1,14 @@
 #include "license.hunspell"
 #include "license.myspell"
 
-#ifndef MOZILLA_CLIENT
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
-#else
+#if defined(MOZILLA_CLIENT) || defined(__sgi)
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#else
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #endif
 
 #include "replist.hxx"
--- src/tools/hunspell.cxx.dist	2009-06-30 10:49:24.606244720 +0100
+++ src/tools/hunspell.cxx	2009-06-30 10:50:39.078164040 +0100
@@ -1,12 +1,21 @@
+#ifdef __sgi
+#include <string.h>
+#else
 #include <cstring>
+#endif
 
 // glibc < 3.0 (for mkstemp)
 #ifndef __USE_MISC
 #define __USE_MISC
 #endif
 
+#ifdef __sgi
+#include <stdlib.h>
+#include <stdio.h>
+#else
 #include <cstdlib>
 #include <cstdio>
+#endif
 #include "config.h"
 #include "hunspell.hxx"
 #include "csutil.hxx"