postfix/fix-multiple-definition-error-with-gcc-10.patch

53 lines
1.8 KiB
Diff
Raw Normal View History

2021-07-30 11:39:22 +08:00
From d40744a7c85af615d5a3bf3db382d35c50f1c508 Mon Sep 17 00:00:00 2001
From: Wietse Venema <wietse@porcupine.org>
Date: Sun, 26 Jan 2020 00:00:00 -0500
Subject: [PATCH] postfix-3.5-20200126
Cleanup: missing 'extern' declarations in some header files.
Eray Aslan. Files: postconf/postconf.h,smtpd/smtpd_expand.h,
trivial-rewrite/trivial-rewrite.h
---
postfix/src/postconf/postconf.h | 2 +-
postfix/src/smtpd/smtpd_expand.h | 2 +-
postfix/src/trivial-rewrite/trivial-rewrite.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/postconf/postconf.h b/src/postconf/postconf.h
index 0f4764875..7b23380a5 100644
--- a/src/postconf/postconf.h
+++ b/src/postconf/postconf.h
@@ -152,7 +152,7 @@ typedef struct {
* Lookup table for master.cf entries. The table is terminated with an entry
* that has a null argv member.
*/
-PCF_MASTER_ENT *pcf_master_table;
+extern PCF_MASTER_ENT *pcf_master_table;
/*
* Line-wrapping support.
diff --git a/src/smtpd/smtpd_expand.h b/src/smtpd/smtpd_expand.h
index 71d705c01..3680036a0 100644
--- a/src/smtpd/smtpd_expand.h
+++ b/src/smtpd/smtpd_expand.h
@@ -18,7 +18,7 @@
/*
* External interface.
*/
-VSTRING *smtpd_expand_filter;
+extern VSTRING *smtpd_expand_filter;
void smtpd_expand_init(void);
const char *smtpd_expand_lookup(const char *, int, void *);
int smtpd_expand(SMTPD_STATE *, VSTRING *, const char *, int);
diff --git a/src/trivial-rewrite/trivial-rewrite.h b/src/trivial-rewrite/trivial-rewrite.h
index bf0dd4a08..42016efb0 100644
--- a/src/trivial-rewrite/trivial-rewrite.h
+++ b/src/trivial-rewrite/trivial-rewrite.h
@@ -23,7 +23,7 @@
/*
* Connection management.
*/
-int server_flags;
+extern int server_flags;
/*
* rewrite.c