mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-10 09:36:16 +02:00
Code

20556: change SOCKLEN_T to ZSOCKLEN_T to avoid clash

This commit is contained in:
Peter Stephenson 2004-11-16 11:04:25 +00:00
parent 24a68220a1
commit fece5e8960
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-11-16 Peter Stephenson <pws@csr.com>
* 20556: AIX 5.3 has a SOCKLEN_T definition, so use
ZSOCKLEN_T internally.
2004-11-12 Peter Stephenson <pws@csr.com>
* Motoi Washida <a66@h8.dion.ne.jp>: 20274, 20552:

2
Src/Modules/socket.c
View File

@ -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;

2
Src/Modules/tcp.c
View File

@ -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;

6
Src/Modules/zftp.c
View File

@ -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) {

3
aczsh.m4
View File

@ -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])]
)