From fece5e8960b0d6200c1a84690bc242c945fdfb1e Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Tue, 16 Nov 2004 11:04:25 +0000 Subject: 20556: change SOCKLEN_T to ZSOCKLEN_T to avoid clash --- ChangeLog | 5 +++++ Src/Modules/socket.c | 2 +- Src/Modules/tcp.c | 2 +- Src/Modules/zftp.c | 6 +++--- aczsh.m4 | 3 ++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index db5697a75..82e11a127 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-11-16 Peter Stephenson + + * 20556: AIX 5.3 has a SOCKLEN_T definition, so use + ZSOCKLEN_T internally. + 2004-11-12 Peter Stephenson * Motoi Washida : 20274, 20552: diff --git a/Src/Modules/socket.c b/Src/Modules/socket.c index 5339e72b7..3a2c590a1 100644 --- a/Src/Modules/socket.c +++ b/Src/Modules/socket.c @@ -61,7 +61,7 @@ static int 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; diff --git a/Src/Modules/tcp.c b/Src/Modules/tcp.c index 586c2a19e..2120ba833 100644 --- a/Src/Modules/tcp.c +++ b/Src/Modules/tcp.c @@ -340,7 +340,7 @@ static int 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; diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 3fb01486a..f41d902db 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -972,7 +972,7 @@ zfopendata(char *name, union tcp_sockaddr *zdsockp, int *is_passivep) #else char portcmd[40]; #endif - SOCKLEN_T len; + ZSOCKLEN_T len; int ret; if (!(zfprefs & ZFPF_SNDP)) { @@ -1065,7 +1065,7 @@ zfclosedata(void) 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 @@ zftp_open(char *name, char **args, int flags) 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) { diff --git a/aczsh.m4 b/aczsh.m4 index 5dd85fba9..a967431da 100644 --- a/aczsh.m4 +++ b/aczsh.m4 @@ -695,6 +695,7 @@ dnl zsh_CHECK_SOCKLEN_T 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 @@ AC_DEFUN([zsh_CHECK_SOCKLEN_T],[ 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])] ) -- cgit v1.2.3-70-g09d2