Merge branch 'master' into bug/3014/krfbbug/3014/krfb

1 files changed, 7 insertions, 1 deletions

diff --git a/kppp/requester.cpp b/kppp/requester.cpp
index b5450929..016d72fa 100644
--- a/kppp/requester.cpp
+++ b/kppp/requester.cpp
@@ -80,7 +80,13 @@ Requester::~Requester() {
 // Receive file name and file descriptors from envoy
 //
 int Requester::recvFD() {
-  struct { struct cmsghdr cmsg; int fd; } control;
+  union {
+    struct {
+      char _cmsg[sizeof(struct cmsghdr)];
+      char data[sizeof(int)];  // int fd field
+    };
+    struct cmsghdr cmsg;
+  } control;
   struct msghdr	msg;
   struct ResponseHeader response;