Merge branch 'master' into cde-next

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.
 

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);