From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22150 invoked from network); 16 Nov 2004 10:46:46 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 16 Nov 2004 10:46:46 -0000 Received: (qmail 9251 invoked from network); 16 Nov 2004 10:46:40 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 16 Nov 2004 10:46:40 -0000 Received: (qmail 18781 invoked by alias); 16 Nov 2004 10:46:26 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 20556 Received: (qmail 18772 invoked from network); 16 Nov 2004 10:46:25 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 16 Nov 2004 10:46:25 -0000 Received: (qmail 8902 invoked from network); 16 Nov 2004 10:46:25 -0000 Received: from mailhost1.csr.com (HELO MAILSWEEPER01.csr.com) (81.105.217.43) by a.mx.sunsite.dk with SMTP; 16 Nov 2004 10:46:24 -0000 Received: from exchange03.csr.com (unverified [10.100.137.60]) by MAILSWEEPER01.csr.com (Content Technologies SMTPRS 4.3.12) with ESMTP id for ; Tue, 16 Nov 2004 10:45:13 +0000 Received: from news01.csr.com ([10.103.143.38]) by exchange03.csr.com with Microsoft SMTPSVC(5.0.2195.6713); Tue, 16 Nov 2004 10:46:11 +0000 Received: from news01.csr.com (localhost.localdomain [127.0.0.1]) by news01.csr.com (8.12.11/8.12.11) with ESMTP id iAGAkLXv031647 for ; Tue, 16 Nov 2004 10:46:21 GMT Received: from csr.com (pws@localhost) by news01.csr.com (8.12.11/8.12.11/Submit) with ESMTP id iAGAkKqm031644 for ; Tue, 16 Nov 2004 10:46:21 GMT Message-Id: <200411161046.iAGAkKqm031644@news01.csr.com> X-Authentication-Warning: news01.csr.com: pws owned process doing -bs To: zsh-workers@sunsite.dk Subject: Re: Build problems on AIX 5.3 In-reply-to: <4199C1CC.7070804@bbwt.demon.nl> References: <4199C1CC.7070804@bbwt.demon.nl> Date: Tue, 16 Nov 2004 10:46:20 +0000 From: Peter Stephenson X-OriginalArrivalTime: 16 Nov 2004 10:46:11.0749 (UTC) FILETIME=[7CE56550:01C4CBC9] X-Spam-Checker-Version: SpamAssassin 2.63 on a.mx.sunsite.dk X-Spam-Level: X-Spam-Status: No, hits=0.0 required=6.0 tests=none autolearn=no version=2.63 X-Spam-Hits: 0.0 Bas de Bakker wrote: > I tried to build zsh 4.2.1 on our new AIX 5.3 machine using gcc 3.4.3. > This failed, because the SOCKLEN_T define used in zsh conflicts with a > SOCKLEN_T define used internally by the AIX header files. (Hi Bas!) Renaming it globally is easy. Index: aczsh.m4 =================================================================== RCS file: /cvsroot/zsh/zsh/aczsh.m4,v retrieving revision 1.16 diff -u -r1.16 aczsh.m4 --- aczsh.m4 14 Feb 2004 18:50:16 -0000 1.16 +++ aczsh.m4 16 Nov 2004 10:41:23 -0000 @@ -695,6 +695,7 @@ dnl dnl check type of third argument of some network functions; currently dnl tested are size_t *, unsigned long *, int *. +dnl call the result ZSOCKLEN_T since some systems have SOCKLEN_T already dnl AC_DEFUN([zsh_CHECK_SOCKLEN_T],[ AC_CACHE_CHECK( @@ -714,7 +715,7 @@ zsh_cv_type_socklen_t=int fi] ) - AC_DEFINE_UNQUOTED([SOCKLEN_T], [$zsh_cv_type_socklen_t], + AC_DEFINE_UNQUOTED([ZSOCKLEN_T], [$zsh_cv_type_socklen_t], [Define to the base type of the third argument of accept])] ) Index: Src/Modules/socket.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/Modules/socket.c,v retrieving revision 1.6 diff -u -r1.6 socket.c --- Src/Modules/socket.c 2 Jun 2004 22:15:00 -0000 1.6 +++ Src/Modules/socket.c 16 Nov 2004 10:41:24 -0000 @@ -61,7 +61,7 @@ bin_zsocket(char *nam, char **args, Options ops, UNUSED(int func)) { int err=1, verbose=0, test=0, targetfd=0; - SOCKLEN_T len; + ZSOCKLEN_T len; struct sockaddr_un soun; int sfd; Index: Src/Modules/tcp.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/Modules/tcp.c,v retrieving revision 1.39 diff -u -r1.39 tcp.c --- Src/Modules/tcp.c 2 Jun 2004 22:15:00 -0000 1.39 +++ Src/Modules/tcp.c 16 Nov 2004 10:41:24 -0000 @@ -340,7 +340,7 @@ bin_ztcp(char *nam, char **args, Options ops, UNUSED(int func)) { int herrno, err=1, destport, force=0, verbose=0, test=0, targetfd=0; - SOCKLEN_T len; + ZSOCKLEN_T len; char **addrp, *desthost, *localname, *remotename; struct hostent *zthost = NULL, *ztpeer = NULL; struct servent *srv; Index: Src/Modules/zftp.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/Modules/zftp.c,v retrieving revision 1.34 diff -u -r1.34 zftp.c --- Src/Modules/zftp.c 21 Oct 2004 00:33:51 -0000 1.34 +++ Src/Modules/zftp.c 16 Nov 2004 10:41:25 -0000 @@ -972,7 +972,7 @@ #else char portcmd[40]; #endif - SOCKLEN_T len; + ZSOCKLEN_T len; int ret; if (!(zfprefs & ZFPF_SNDP)) { @@ -1065,7 +1065,7 @@ static int zfgetdata(char *name, char *rest, char *cmd, int getsize) { - SOCKLEN_T len; + ZSOCKLEN_T len; int newfd, is_passive; union tcp_sockaddr zdsock; @@ -1702,7 +1702,7 @@ char **addrp, *fname, *tmpptr, *portnam = "ftp"; char *hostnam, *hostsuffix; int err, tmout, port = -1; - SOCKLEN_T len; + ZSOCKLEN_T len; int herrno, af, hlen; if (!*args) { -- Peter Stephenson Software Engineer CSR PLC, Churchill House, Cambridge Business Park, Cowley Road Cambridge, CB4 0WZ, UK Tel: +44 (0)1223 692070 ********************************************************************** This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. This footnote also confirms that this email message has been swept by MIMEsweeper for the presence of computer viruses. www.mimesweeper.com **********************************************************************