compilation on IRIX 5

compilation on IRIX 5

[Oliver Kiddle]

netinet/in_systm.h on IRIX 5 doesn't protect against being included
twice so it being included in both tcp.c and tcp.h results in an error.
Is it really necessary to duplicate this bit? Something like this patch
is necessary for compilation on IRIX 5.

When I changed the chmod in the C02 test for MacOS X I feared that it
would cause a problem elsewhere. It seems IRIX overloads the numbers
somehow for some `mandatory locking' feature. So I'll change that test
again once I've been able to check that I'm not breaking the test on
MacOS X again. That'll be whenever the sourceforge compilefarm comes
back up.

Oliver

Index: Src/Modules/tcp.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/tcp.c,v
retrieving revision 1.17
diff -u -r1.17 tcp.c
--- Src/Modules/tcp.c   2001/10/08 07:19:35     1.17
+++ Src/Modules/tcp.c   2001/10/08 16:25:52
@@ -35,22 +35,6 @@
  */
 #include "tcp.h"
 
-/*
- * For some reason, configure doesn't always detect netinet/in_systm.h.
- * On some systems, including linux, this seems to be because gcc is
- * throwing up a warning message about the redefinition of
- * __USE_LARGEFILE.  This means the problem is somewhere in the
- * header files where we can't get at it.  For now, revert to
- * not including this file only on systems where we know it's missing.
- * Currently this is just cygwin.
- */
-#ifndef __CYGWIN__
-# include <netinet/in_systm.h>
-#endif
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <arpa/inet.h>
-
 /* it's a TELNET based protocol, but don't think I like doing this */
 #include <arpa/telnet.h>

_____________________________________________________________________
This message has been checked for all known viruses by the 
MessageLabs Virus Scanning Service. For further information visit
http://www.messagelabs.com/stats.asp

Re: compilation on IRIX 5

[Bart Schaefer]

On Oct 8,  5:30pm, Oliver Kiddle wrote:
} Subject: compilation on IRIX 5
}
} netinet/in_systm.h on IRIX 5 doesn't protect against being included
} twice so it being included in both tcp.c and tcp.h results in an error.
} Is it really necessary to duplicate this bit?

No, it's not necessary.  At one time tcp.c didn't include tcp.h, but now
that it does, that part is redundant.

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net