diff options
Diffstat (limited to 'fetchmail.c')
| -rw-r--r-- | fetchmail.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fetchmail.c b/fetchmail.c index 80993ccb..5e570154 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -964,7 +964,7 @@ static void optmerge(struct query *h2, struct query *h1, int force) list_merge(&h2->domainlist, &h1->domainlist, force); list_merge(&h2->antispam, &h1->antispam, force); -#define FLAG_MERGE(fld) if (force ? !!h1->fld : !h2->fld) h2->fld = h1->fld +#define FLAG_MERGE(fld) do { if (force ? !!h1->fld : !h2->fld) h2->fld = h1->fld; } while (0) FLAG_MERGE(server.via); FLAG_MERGE(server.protocol); FLAG_MERGE(server.service); @@ -1575,6 +1575,7 @@ static int query_host(struct query *ctl) default: report(stderr, GT_("unsupported protocol selected.\n")); st = PS_PROTOCOL; + break; } /* |