Conflict with zftp + tcp modules?

Conflict with zftp + tcp modules?

[Bart Schaefer]

I hadn't noticed this until I attempted to statically include both modules
in the same build:

In file included from zftp.c:53:
zftp.mdh:6: warning: `boot_' redefined
tcp.mdh:6: warning: this is the location of the previous definition
zftp.mdh:7: warning: `cleanup_' redefined
tcp.mdh:7: warning: this is the location of the previous definition
zftp.mdh:8: warning: `setup_' redefined
tcp.mdh:8: warning: this is the location of the previous definition
zftp.mdh:9: warning: `finish_' redefined
tcp.mdh:9: warning: this is the location of the previous definition

RE: Conflict with zftp + tcp modules?

[Borzenkov Andrey]

> 
> I hadn't noticed this until I attempted to statically include both modules
> in the same build:
> 
> In file included from zftp.c:53:
> zftp.mdh:6: warning: `boot_' redefined
> tcp.mdh:6: warning: this is the location of the previous definition
> zftp.mdh:7: warning: `cleanup_' redefined
> tcp.mdh:7: warning: this is the location of the previous definition
> zftp.mdh:8: warning: `setup_' redefined
> tcp.mdh:8: warning: this is the location of the previous definition
> zftp.mdh:9: warning: `finish_' redefined
> tcp.mdh:9: warning: this is the location of the previous definition

it was never intended to work this way. Zftp.c includes zftp.mdh and tcp.h
that in turn includes tcp.mdh. mdh is expected to _the_ only and single mdh
for the module being compiled; having two mdh's is wrong.

Oliver, Peter, could you look in tcp and see if you can move tcp.mdh into
tcp.c?

-andrey

Re: Conflict with zftp + tcp modules?

[Peter Stephenson]

Borzenkov Andrey wrote:
> it was never intended to work this way. Zftp.c includes zftp.mdh and tcp.h
> that in turn includes tcp.mdh. mdh is expected to _the_ only and single mdh
> for the module being compiled; having two mdh's is wrong.
> 
> Oliver, Peter, could you look in tcp and see if you can move tcp.mdh =
> into
> tcp.c?

Seems to be trivial, at least it doesn't generate any new errors or
warnings here.

Index: Src/Modules/tcp.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/tcp.c,v
retrieving revision 1.34
diff -u -r1.34 tcp.c
--- Src/Modules/tcp.c	6 Feb 2003 12:21:49 -0000	1.34
+++ Src/Modules/tcp.c	23 Apr 2003 18:37:06 -0000
@@ -34,6 +34,7 @@
  * doesn't exist on cygwin.
  */
 #include "tcp.h"
+#include "tcp.mdh"
 
 /*
  * We use poll() in preference to select because some subset of manuals says
Index: Src/Modules/tcp.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/tcp.h,v
retrieving revision 1.6
diff -u -r1.6 tcp.h
--- Src/Modules/tcp.h	2 Oct 2001 02:35:01 -0000	1.6
+++ Src/Modules/tcp.h	23 Apr 2003 18:37:06 -0000
@@ -83,7 +83,6 @@
     int flags;
 };
 
-#include "tcp.mdh"
 #include "tcp.pro"
 
 #ifndef INET_ADDRSTRLEN

-- 
Peter Stephenson <pws@pwstephenson.fsnet.co.uk>
Work: pws@csr.com
Web: http://www.pwstephenson.fsnet.co.uk