1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

mail/cyrus-imapd{25,30,32}: Fix build with more recent Perl

PR:		273093
Reported by:	delphij
Submitted by:	delphij
This commit is contained in:
Hajimu UMEMOTO 2023-08-14 02:14:45 +09:00
parent ba7720b45c
commit 182235082a
3 changed files with 32 additions and 12 deletions

View File

@ -0,0 +1,16 @@
--- lib/assert.h.orig 2021-03-09 02:28:07 UTC
+++ lib/assert.h
@@ -43,11 +43,13 @@
#ifndef INCLUDED_ASSERT_H
#define INCLUDED_ASSERT_H
+#ifndef PERL_POLLUTE
#ifdef __STDC__
#define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);}
void assertionfailed(const char *file, int line, const char *expr);
#else
#define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);}
+#endif
#endif
#endif /* INCLUDED_ASSERT_H */

View File

@ -1,9 +1,10 @@
--- lib/assert.h.orig 2017-09-02 01:09:05 UTC
--- lib/assert.h.orig 2023-02-12 23:06:46 UTC
+++ lib/assert.h
@@ -43,6 +43,10 @@
@@ -43,11 +43,21 @@
#ifndef INCLUDED_ASSERT_H
#define INCLUDED_ASSERT_H
+#ifndef PERL_POLLUTE
+#ifdef __cplusplus
+extern "C" {
+#endif
@ -11,12 +12,13 @@
#ifdef __STDC__
#define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);}
void assertionfailed(const char *file, int line, const char *expr);
@@ -50,4 +54,8 @@ void assertionfailed(const char *file, i
#else
#define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);}
#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
#endif
#endif /* INCLUDED_ASSERT_H */

View File

@ -1,9 +1,10 @@
--- lib/assert.h.orig 2017-09-02 01:09:05 UTC
--- lib/assert.h.orig 2023-02-12 23:06:46 UTC
+++ lib/assert.h
@@ -43,6 +43,10 @@
@@ -43,11 +43,21 @@
#ifndef INCLUDED_ASSERT_H
#define INCLUDED_ASSERT_H
+#ifndef PERL_POLLUTE
+#ifdef __cplusplus
+extern "C" {
+#endif
@ -11,12 +12,13 @@
#ifdef __STDC__
#define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);}
void assertionfailed(const char *file, int line, const char *expr);
@@ -50,4 +54,8 @@ void assertionfailed(const char *file, i
#else
#define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);}
#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
#endif
#endif /* INCLUDED_ASSERT_H */