From b578dca48606c5dbafb74ec9d7b318aaa4425f57 Mon Sep 17 00:00:00 2001 From: Pascal Stumpf Date: Sun, 19 Aug 2012 18:19:40 +0200 Subject: [PATCH] OpenBSD still uses GNU iconv, so the second argument to iconv(3) is not const. --- cde/programs/dtmail/libDtMail/Common/Session.C | 2 +- cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C b/cde/programs/dtmail/libDtMail/Common/Session.C index 0c664cca3..5ad49d058 100644 --- a/cde/programs/dtmail/libDtMail/Common/Session.C +++ b/cde/programs/dtmail/libDtMail/Common/Session.C @@ -1618,7 +1618,7 @@ char *from_cs, char *to_cs) DtMailEnv error; iconv_t cd; size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0; -#if defined(_AIX) || defined(sun) | defined(CSRG_BASED) +#if defined(_AIX) || defined(sun) || defined(__FreeBSD__) const char *ip = (const char *) *bp; #else char *ip = *bp; diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C index 172b844ef..065114994 100644 --- a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C +++ b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C @@ -1030,7 +1030,7 @@ char *from_cs, char *to_cs) DtMailEnv error; iconv_t cd; size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0; -#if defined(_aix) || defined(sun) || defined(CSRG_BASED) +#if defined(_aix) || defined(sun) || defined(__FreeBSD__) const char *ip = (const char *) *bp; #else char *ip = *bp;