Resolve inconsistent strcasestr availability on Sun

diff --git a/cde/programs/dtmail/dtmail/FindDialog.C b/cde/programs/dtmail/dtmail/FindDialog.C
index 1f489b5b2aae6acf151f6327d71188ddf390f628..cef88a7d549d167ff79a2a3974db1d26fc1c2bfd 100644 (file)
--- a/cde/programs/dtmail/dtmail/FindDialog.C
+++ b/cde/programs/dtmail/dtmail/FindDialog.C
@@ -729,13 +729,13 @@ FindDialog::compareMessage(DtMailMessageHandle      handle)
   return(found);
 }
 
-#if !defined(CSRG_BASED) && !defined(__linux__) && !defined(sun)
+#if !defined(CSRG_BASED) && !defined(__linux__)
 //
 // See if string 'toFind' is anyware in string 'str'.
 // A case-insensitive version of strstr().
 //
 static const char      *
-strcasestr(const char *str, const char *toFind)
+FindDialog::strcasestr(const char *str, const char *toFind)
 {
   const char   *result = NULL;         // Default to not found.
 

diff --git a/cde/programs/dtmail/dtmail/FindDialog.h b/cde/programs/dtmail/dtmail/FindDialog.h
index b3dc141dbdfecca99f3cc91a43dc80341e254d02..2b99d44b13948f73664d688831e0036c5e60968b 100644 (file)
--- a/cde/programs/dtmail/dtmail/FindDialog.h
+++ b/cde/programs/dtmail/dtmail/FindDialog.h
@@ -102,6 +102,11 @@ private:
 
   Boolean      compareMessage(DtMailMessageHandle        handle);
 
+  #if !defined(CSRG_BASED) && !defined(__linux__)
+  static const char * strcasestr(const char *str,
+                                const char *toFind);
+  #endif
+
   Boolean      compareHeader(DtMailEnv         & error,
                      DtMailValueSeq    & seq,
                      const char        * cmpToString);