From 408f8256cde9c70ee14cf58a4235900f3afe0581 Mon Sep 17 00:00:00 2001 From: "Matthew R. Trower" Date: Tue, 19 Jun 2018 15:25:20 -0500 Subject: [PATCH] Resolve inconsistent strcasestr availability on Sun --- cde/programs/dtmail/dtmail/FindDialog.C | 4 ++-- cde/programs/dtmail/dtmail/FindDialog.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cde/programs/dtmail/dtmail/FindDialog.C b/cde/programs/dtmail/dtmail/FindDialog.C index 1f489b5b..cef88a7d 100644 --- 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 b3dc141d..2b99d44b 100644 --- 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); -- 2.25.1