зеркало из https://github.com/mozilla/pjs.git
Bugzilla bug #40778: renamed the 'connectcontinue' member of PRIOMethods
back to 'reserver_fn_4' to maintain source compatibility. Modified files: prio.h, priometh.c, prlayer.c, prsocket.c, ptio.c
This commit is contained in:
Родитель
c510f6a7b7
Коммит
aa3ceb1ea4
|
@ -399,7 +399,7 @@ struct PRIOMethods {
|
|||
PRSetsocketoptionFN setsocketoption;
|
||||
/* Set value of specified option */
|
||||
PRSendfileFN sendfile; /* Send a (partial) file with header/trailer*/
|
||||
PRConnectcontinueFN connectcontinue;
|
||||
PRConnectcontinueFN reserved_fn_4; /* the connectcontinue method */
|
||||
/* Continue a nonblocking connect */
|
||||
PRReservedFN reserved_fn_3; /* reserved for future use */
|
||||
PRReservedFN reserved_fn_2; /* reserved for future use */
|
||||
|
|
|
@ -185,7 +185,7 @@ PR_IMPLEMENT(PRStatus) PR_Connect(
|
|||
PR_IMPLEMENT(PRStatus) PR_ConnectContinue(
|
||||
PRFileDesc *fd, PRInt16 out_flags)
|
||||
{
|
||||
return((fd->methods->connectcontinue)(fd,out_flags));
|
||||
return((fd->methods->reserved_fn_4)(fd,out_flags));
|
||||
}
|
||||
|
||||
PR_IMPLEMENT(PRFileDesc*) PR_Accept(PRFileDesc *fd, PRNetAddr *addr,
|
||||
|
|
|
@ -197,7 +197,7 @@ static PRStatus PR_CALLBACK pl_DefConnectcontinue (
|
|||
PR_ASSERT(fd != NULL);
|
||||
PR_ASSERT(fd->lower != NULL);
|
||||
|
||||
return (fd->lower->methods->connectcontinue)(fd->lower, out_flags);
|
||||
return (fd->lower->methods->reserved_fn_4)(fd->lower, out_flags);
|
||||
}
|
||||
|
||||
static PRFileDesc* PR_CALLBACK pl_TopAccept (
|
||||
|
|
|
@ -379,7 +379,7 @@ PR_IMPLEMENT(PRStatus) PR_GetConnectStatus(const PRPollDesc *pd)
|
|||
PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
|
||||
return PR_FAILURE;
|
||||
}
|
||||
return bottom->methods->connectcontinue(bottom, pd->out_flags);
|
||||
return bottom->methods->reserved_fn_4(bottom, pd->out_flags);
|
||||
}
|
||||
|
||||
static PRFileDesc* PR_CALLBACK SocketAccept(PRFileDesc *fd, PRNetAddr *addr,
|
||||
|
|
|
@ -1403,7 +1403,7 @@ PR_IMPLEMENT(PRStatus) PR_GetConnectStatus(const PRPollDesc *pd)
|
|||
PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
|
||||
return PR_FAILURE;
|
||||
}
|
||||
return bottom->methods->connectcontinue(bottom, pd->out_flags);
|
||||
return bottom->methods->reserved_fn_4(bottom, pd->out_flags);
|
||||
} /* PR_GetConnectStatus */
|
||||
|
||||
static PRFileDesc* pt_Accept(
|
||||
|
|
Загрузка…
Ссылка в новой задаче