Fix errors relating to normal poll() usage (only MacOS affected).

xrootd · Jan 30, 2014 · 2aaa7ec · 2aaa7ec
1 parent e5b9986
commit 2aaa7ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/XrdSys/XrdSysIOEvents.hh b/src/XrdSys/XrdSysIOEvents.hh
@@ -475,8 +475,10 @@ struct          PipeData {char req; char evt; short ent; int fd;
                           XrdSysSemaphore *theSem;
                           enum cmd {NoOp = 0, MdFD = 1, Post = 2,
                                     MiFD = 3, RmFD = 4, Stop = 5};
-                          PipeData(char rqv=0) : req(rqv), evt(0), ent(0), fd(0),
-                                                 theSem(0) {}
+                          PipeData(char reQ=0, char evT=0, short enT=0,
+                                   int  fD =0, XrdSysSemaphore *sP=0)
+                                  : req(reQ), evt(evT), ent(enT), fd(fD),
+                                    theSem(sP) {}
                          ~PipeData() {}
                          };
 PipeData        reqBuff;    // Buffer used by poller thread to recv data

diff --git a/src/XrdSys/XrdSysIOEventsPollPoll.icc b/src/XrdSys/XrdSysIOEventsPollPoll.icc
@@ -278,7 +278,7 @@ void XrdSys::IOEvents::PollPoll::Exclude(XrdSys::IOEvents::Channel *cP,
       {FDRem(ctnum);
        return;
       } else {
-       PipeData cmdbuff = {(char)PipeData::RmFD,0,(short)ctnum,cP->GetFD(),0};
+       PipeData cmdbuff((char)PipeData::RmFD,0,(short)ctnum,cP->GetFD());
        if (isLocked) {isLocked = false; UnLockChannel(cP);}
        SendCmd(cmdbuff);
       }