# HG changeset patch # User Yuya Nishihara # Date 2016-02-02 11:56:48 # Node ID 3d23700cf4a9f6248872beaf8dabbabc5b59fea9 # Parent 5907ed2b56fb6b0545fa0711b208c49704730a55 osutil: disable compilation of recvfds() on unsupported platforms It appears that Solaris doesn't provide CMSG_LEN(), msg_control, etc. As recvfds() is only necessary for chg, this patch just drops it if CMSG_LEN isn't defined, which is the same workaround as Python 3.x. https://hg.python.org/cpython/rev/c64216addd7f#l7.33 diff --git a/mercurial/osutil.c b/mercurial/osutil.c --- a/mercurial/osutil.c +++ b/mercurial/osutil.c @@ -653,7 +653,11 @@ bail: /* * recvfds() simply does not release GIL during blocking io operation because * command server is known to be single-threaded. + * + * Old systems such as Solaris don't provide CMSG_LEN, msg_control, etc. + * Currently, recvfds() is not supported on these platforms. */ +#ifdef CMSG_LEN static ssize_t recvfdstobuf(int sockfd, int **rfds, void *cbuf, size_t cbufsize) { @@ -713,6 +717,7 @@ bail: return NULL; } +#endif /* CMSG_LEN */ #endif /* ndef _WIN32 */ static PyObject *listdir(PyObject *self, PyObject *args, PyObject *kwargs) @@ -881,9 +886,11 @@ static PyMethodDef methods[] = { {"statfiles", (PyCFunction)statfiles, METH_VARARGS | METH_KEYWORDS, "stat a series of files or symlinks\n" "Returns None for non-existent entries and entries of other types.\n"}, +#ifdef CMSG_LEN {"recvfds", (PyCFunction)recvfds, METH_VARARGS, "receive list of file descriptors via socket\n"}, #endif +#endif #ifdef __APPLE__ { "isgui", (PyCFunction)isgui, METH_NOARGS,