From 330fa6dc4bfe94390927f742372a3cbc289911b0 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Wed, 16 Feb 2005 18:25:04 +0000
Subject: [PATCH] Bug #280901 --> Fix ports bustage for OSF/1 builds

Patch by
Laxmi Harikumar

r=mvl
sr=me
---
 .../spellcheck/myspell/src/README.mozilla     | 66 +++++++++++++++++++
 .../spellcheck/myspell/src/affentry.cpp       |  8 +--
 .../spellcheck/myspell/src/affixmgr.cpp       |  6 +-
 .../spellcheck/myspell/src/affixmgr.hxx       |  2 +-
 extensions/spellcheck/myspell/src/csutil.cpp  |  6 +-
 extensions/spellcheck/myspell/src/hashmgr.cpp |  6 +-
 extensions/spellcheck/myspell/src/myspell.cpp |  6 +-
 .../spellcheck/myspell/src/suggestmgr.cpp     |  8 +--
 8 files changed, 87 insertions(+), 21 deletions(-)

diff --git a/extensions/spellcheck/myspell/src/README.mozilla b/extensions/spellcheck/myspell/src/README.mozilla
index a67011fca2e1..16ab3a3dab66 100644
--- a/extensions/spellcheck/myspell/src/README.mozilla
+++ b/extensions/spellcheck/myspell/src/README.mozilla
@@ -12,3 +12,69 @@ Changes made for mozilla:
 * Commented out std namespace declarations from .cpp files (using namespace std;)
 * Removed #include <unistd.h> for the build system
 * Some specific changes are needed for SunONE studio compiler, please refer to https://bugzilla.mozilla.org/show_bug.cgi?id=278672
+* The files cctype.h,cstring.h,cstdio.h etc are not supported by all compilers.
+  So the following files need to be changed.
+  Refer bug 280901 (http://bugzilla.mozilla.org/show_bug.cgi?id=280901)
+    - mozilla/extensions/spellcheck/myspell/src/affentry.cpp
+      Use:
+         #include <ctype.h>
+         #include <string.h>
+         #include <stdlib.h>
+         #include <stdio.h>
+      instead of
+         #include <cctype>
+         #include <cstring>
+         #include <cstdlib>
+         #include <cstdio>
+    - mozilla/extensions/spellcheck/myspell/src/affixmgr.cpp
+      Use:
+        #include <stdlib.h>
+        #include <string.h>
+        #include <stdio.h>
+      instead of:
+        #include <cstdlib>
+        #include <cstring>
+        #include <cstdio>
+    - mozilla/extensions/spellcheck/myspell/src/affixmgr.hxx
+      Use:
+        #include <stdio.h>
+      instead of:
+        #include <cstdio>
+    - mozilla/extensions/spellcheck/myspell/src/csutil.cpp
+      Use:
+        #include <stdlib.h>
+        #include <string.h>
+        #include <stdio.h>
+      instead of:
+        #include <cstdlib>
+        #include <cstring>
+        #include <cstdio>
+    - mozilla/extensions/spellcheck/myspell/src/hashmgr.cpp
+      Use:
+        #include <stdlib.h>
+        #include <string.h>
+        #include <stdio.h>
+      instead of:
+        #include <cstdlib>
+        #include <cstring>
+        #include <cstdio>
+    - mozilla/extensions/spellcheck/myspell/src/myspell.cpp
+      Use:
+        #include <string.h>
+        #include <stdlib.h>
+        #include <stdio.h>
+      instead of:
+        #include <cstring>
+        #include <cstdlib>
+        #include <cstdio>
+    - mozilla/extensions/spellcheck/myspell/src/suggestmgr.cpp
+      Use:
+        #include <stdlib.h>
+        #include <ctype.h>
+        #include <string.h>
+        #include <stdio.h>
+      instead of:
+        #include <cstdlib>
+        #include <cctype>
+        #include <cstring>
+        #include <cstdio>
diff --git a/extensions/spellcheck/myspell/src/affentry.cpp b/extensions/spellcheck/myspell/src/affentry.cpp
index 4e9a08eb72be..ebc5d1452abf 100644
--- a/extensions/spellcheck/myspell/src/affentry.cpp
+++ b/extensions/spellcheck/myspell/src/affentry.cpp
@@ -1,9 +1,9 @@
 #include "license.readme"
 
-#include <cctype>
-#include <cstring>
-#include <cstdlib>
-#include <cstdio>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h> 
+#include <stdio.h> 
 
 #include "affentry.hxx"
 
diff --git a/extensions/spellcheck/myspell/src/affixmgr.cpp b/extensions/spellcheck/myspell/src/affixmgr.cpp
index ed10fd8bb7fd..32c3e3b84660 100644
--- a/extensions/spellcheck/myspell/src/affixmgr.cpp
+++ b/extensions/spellcheck/myspell/src/affixmgr.cpp
@@ -1,8 +1,8 @@
 #include "license.readme"
 
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#include <stdlib.h> 
+#include <string.h>
+#include <stdio.h> 
 
 #include "affixmgr.hxx"
 #include "affentry.hxx"
diff --git a/extensions/spellcheck/myspell/src/affixmgr.hxx b/extensions/spellcheck/myspell/src/affixmgr.hxx
index 444f8945758d..6a11be09a735 100644
--- a/extensions/spellcheck/myspell/src/affixmgr.hxx
+++ b/extensions/spellcheck/myspell/src/affixmgr.hxx
@@ -8,7 +8,7 @@ using namespace std;
 #include "atypes.hxx"
 #include "baseaffix.hxx"
 #include "hashmgr.hxx"
-#include <cstdio>
+#include <stdio.h> 
 
 class AffixMgr
 {
diff --git a/extensions/spellcheck/myspell/src/csutil.cpp b/extensions/spellcheck/myspell/src/csutil.cpp
index 3f69b5007f96..1803bd6af7ab 100644
--- a/extensions/spellcheck/myspell/src/csutil.cpp
+++ b/extensions/spellcheck/myspell/src/csutil.cpp
@@ -1,6 +1,6 @@
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 #include "csutil.hxx"
 
 #include "nsCOMPtr.h"
diff --git a/extensions/spellcheck/myspell/src/hashmgr.cpp b/extensions/spellcheck/myspell/src/hashmgr.cpp
index b4971a5a572b..abe7fde54a2b 100644
--- a/extensions/spellcheck/myspell/src/hashmgr.cpp
+++ b/extensions/spellcheck/myspell/src/hashmgr.cpp
@@ -1,8 +1,8 @@
 #include "license.readme"
 
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 
 #include "hashmgr.hxx"
 
diff --git a/extensions/spellcheck/myspell/src/myspell.cpp b/extensions/spellcheck/myspell/src/myspell.cpp
index 8c91ffd2d622..36978847e48a 100644
--- a/extensions/spellcheck/myspell/src/myspell.cpp
+++ b/extensions/spellcheck/myspell/src/myspell.cpp
@@ -1,7 +1,7 @@
 #include "license.readme"
-#include <cstring>
-#include <cstdlib>
-#include <cstdio>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include "myspell.hxx"
 
diff --git a/extensions/spellcheck/myspell/src/suggestmgr.cpp b/extensions/spellcheck/myspell/src/suggestmgr.cpp
index c0a1c6989feb..7df90b8cb92f 100644
--- a/extensions/spellcheck/myspell/src/suggestmgr.cpp
+++ b/extensions/spellcheck/myspell/src/suggestmgr.cpp
@@ -1,8 +1,8 @@
 #include "license.readme"
-#include <cstdlib>
-#include <cctype>
-#include <cstring>
-#include <cstdio>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
 
 #include "suggestmgr.hxx"