Macro redefined warnings in zftp.c

Macro redefined warnings in zftp.c

[Bart Schaefer]

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
           ^
In file included from zftp.c:54:
./zftp.mdh:6:12: warning: 'cleanup_' macro redefined
#   define cleanup_ cleanup_zshQszftp
           ^
./tcp.mdh:6:12: note: previous definition is here
#   define cleanup_ cleanup_zshQsnetQstcp
           ^
In file included from zftp.c:54:
./zftp.mdh:7:12: warning: 'features_' macro redefined
#   define features_ features_zshQszftp
           ^
./tcp.mdh:7:12: note: previous definition is here
#   define features_ features_zshQsnetQstcp
           ^
In file included from zftp.c:54:
./zftp.mdh:8:12: warning: 'enables_' macro redefined
#   define enables_ enables_zshQszftp
           ^
./tcp.mdh:8:12: note: previous definition is here
#   define enables_ enables_zshQsnetQstcp
           ^
In file included from zftp.c:54:
./zftp.mdh:9:12: warning: 'setup_' macro redefined
#   define setup_ setup_zshQszftp
           ^
./tcp.mdh:9:12: note: previous definition is here
#   define setup_ setup_zshQsnetQstcp
           ^
In file included from zftp.c:54:
./zftp.mdh:10:12: warning: 'finish_' macro redefined
#   define finish_ finish_zshQszftp
           ^
./tcp.mdh:10:12: note: previous definition is here
#   define finish_ finish_zshQsnetQstcp
           ^
6 warnings generated.

Re: Macro redefined warnings in zftp.c

[Peter Stephenson]

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