Attachment 219566 Details for Bug 250740 – Work around the #define hacks in c-client.h

[patch] Work around the #define hacks in c-client.h

mail__cclient-workaround-define-hacks-1.diff (text/plain), 1.68 KB, created by Dimitry Andric on 2020-11-11 17:54:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2020-11-11 17:54:00 UTC

Size: 1.68 KB

patch

obsolete

>Index: mail/cclient/Makefile
>===================================================================
>--- mail/cclient/Makefile	(revision 554905)
>+++ mail/cclient/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	cclient
> PORTVERSION=	2007f
>-PORTREVISION=	4
>+PORTREVISION=	5
> PORTEPOCH=	1
> CATEGORIES=	mail devel
> MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
>Index: mail/cclient/files/patch-src_c-client_c-client.h
>===================================================================
>--- mail/cclient/files/patch-src_c-client_c-client.h	(nonexistent)
>+++ mail/cclient/files/patch-src_c-client_c-client.h	(working copy)
>@@ -0,0 +1,26 @@
>+--- src/c-client/c-client.h.orig	2011-07-23 00:20:18 UTC
>++++ src/c-client/c-client.h
>+@@ -39,7 +39,23 @@ extern "C" {
>+ #endif
>+ 
>+ #include "mail.h"		/* primary interfaces */
>++
>++#ifdef __cplusplus		/* undo hacks before including OS headers */
>++#undef private
>++#undef and
>++#undef or
>++#undef not
>++#endif
>++
>+ #include "osdep.h"		/* OS-dependent routines */
>++
>++#ifdef __cplusplus		/* redo hacks after including OS headers */
>++#define private cclientPrivate
>++#define and cclientAnd
>++#define or cclientOr
>++#define not cclientNot
>++#endif
>++
>+ #include "rfc822.h"		/* RFC822 and MIME routines */
>+ #include "smtp.h"		/* SMTP sending routines */
>+ #include "nntp.h"		/* NNTP sending routines */
>
>Property changes on: mail/cclient/files/patch-src_c-client_c-client.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 250740: 219221 | 219554 | 219563 | 219566