From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-33582-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 13208 invoked by alias); 31 Oct 2014 10:05:31 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 33582
Received: (qmail 233 invoked from network); 31 Oct 2014 10:05:20 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI,
	SPF_HELO_PASS autolearn=ham version=3.3.2
X-AuditID: cbfec7f5-b7f956d000005ed7-56-54535ed9e806
Date: Fri, 31 Oct 2014 10:05:12 +0000
From: Peter Stephenson <p.stephenson@samsung.com>
To: zsh-workers@zsh.org
Subject: Re: Macro redefined warnings in zftp.c
Message-id: <20141031100512.0e036854@pwslap01u.europe.root.pri>
In-reply-to: <alpine.LRH.2.00.1410301622160.26348@toltec.zanshin.com>
References: <alpine.LRH.2.00.1410301622160.26348@toltec.zanshin.com>
Organization: Samsung Cambridge Solution Centre
X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.0; i386-redhat-linux-gnu)
MIME-version: 1.0
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7bit
X-Brightmail-Tracker:
 H4sIAAAAAAAAA+NgFupmluLIzCtJLcpLzFFi42I5/e/4Fd2bccEhBnMajC0ONj9kcmD0WHXw
	A1MAYxSXTUpqTmZZapG+XQJXxtpZ1gUf2Sr2zF3C1sC4l7WLkZNDQsBEYtXl9VC2mMSFe+vZ
	uhi5OIQEljJK3Ju4jhkkISSwnEmi+2gaiM0ioCrxadt+NhCbTcBQYuqm2YwgtoiAuMTZtedZ
	QGxhAX2JPfP/s4PYvAL2EjPvnAKzOQVcJeZv6WGDmOkisfbJX7D5/ED1V/9+YoI4Aqj+yhlG
	iF5BiR+T74HNZBbQkti8rYkVwpaX2LzmLfMERoFZSMpmISmbhaRsASPzKkbR1NLkguKk9Fwj
	veLE3OLSvHS95PzcTYyQAPy6g3HpMatDjAIcjEo8vBpfgkKEWBPLiitzDzFKcDArifCKuAeH
	CPGmJFZWpRblxxeV5qQWH2Jk4uCUamA8etbw7Wvhnq2BLQ8rNLNZer9rKT2Nnup2UmWffM3j
	shOtz++wWQsovRfiPHgizDJQ5POL15v0ndfq1zSUde4UC9UrnuZuc73I+tQ8v9yGme0xRsv8
	FpusaFbgsZgRt+jz6YiZe/+smjE9hPvC5LubMxxtLR6G/Pvz+LvA/gtPwr7n3mK69W6iEktx
	RqKhFnNRcSIA3OaYCR4CAAA=

On Thu, 30 Oct 2014 16:23:58 -0700 (PDT)
Bart Schaefer <schaefer@brasslantern.com> wrote:
> Just noticed these (harmless but lengthy) compiler warnings when building
> on MacOS:
> 
> 
> In file included from zftp.c:54:
> ./zftp.mdh:5:12: warning: 'boot_' macro redefined
> #   define boot_ boot_zshQszftp
>            ^
> ./tcp.mdh:5:12: note: previous definition is here
> #   define boot_ boot_zshQsnetQstcp
>            ^

I don't think we need the internal module definitions for the tcp module
in the zftp module, just the public interface.

diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c
index d16e2f6..09d4bd7 100644
--- a/Src/Modules/zftp.c
+++ b/Src/Modules/zftp.c
@@ -50,7 +50,6 @@ struct zftp_session;
 typedef struct zftp_session *Zftp_session;
 
 #include "tcp.h"
-#include "tcp.mdh"
 #include "zftp.mdh"
 #include "zftp.pro"
 
pws