src/cxx_supportlib/IOTools/IOUtils.cpp in passenger-6.0.11 vs src/cxx_supportlib/IOTools/IOUtils.cpp in passenger-6.0.12
- old
+ new
@@ -1181,11 +1181,11 @@
}
struct msghdr msg;
struct iovec vec;
char dummy[1];
- #if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+ #if defined(__APPLE__) || defined(__SOLARIS__)
// File descriptor passing macros (CMSG_*) seem to be broken
// on 64-bit MacOS X. This structure works around the problem.
struct {
struct cmsghdr header;
int fd;
@@ -1224,11 +1224,11 @@
|| control_header->cmsg_level != SOL_SOCKET
|| control_header->cmsg_type != SCM_RIGHTS) {
throw IOException("No valid file descriptor received.");
}
- #if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+ #if defined(__APPLE__) || defined(__SOLARIS__)
return control_data.fd;
#else
return *((int *) CMSG_DATA(control_header));
#endif
}
@@ -1240,11 +1240,11 @@
}
struct msghdr msg;
struct iovec vec;
char dummy[1];
- #if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+ #if defined(__APPLE__) || defined(__SOLARIS__)
struct {
struct cmsghdr header;
int fd;
} control_data;
#else
@@ -1271,10 +1271,10 @@
msg.msg_flags = 0;
control_header = CMSG_FIRSTHDR(&msg);
control_header->cmsg_level = SOL_SOCKET;
control_header->cmsg_type = SCM_RIGHTS;
- #if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+ #if defined(__APPLE__) || defined(__SOLARIS__)
control_header->cmsg_len = sizeof(control_data);
control_data.fd = fdToSend;
#else
control_header->cmsg_len = CMSG_LEN(sizeof(int));
memcpy(CMSG_DATA(control_header), &fdToSend, sizeof(int));