From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 29 Apr 2013 15:10:56 +0000 (+0200)
Subject: correct bogus use of poll(2) related constants, improving non-Linux portability.... 
X-Git-Tag: auth-3.3-rc1~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd5e1584721a262db36ee34bbfa0e6ec5065a240;p=pdns

correct bogus use of poll(2) related constants, improving non-Linux portability. Thanks Wouter de Jong
---

diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index 4bc3492c1..1eb3ae1fb 100644
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -135,7 +135,7 @@ void UDPNameserver::bindIPv4()
     L<<Logger::Error<<"UDP server bound to "<<inet_ntoa(locala.sin_addr)<<":"<<::arg().asNum("local-port")<<endl;
     struct pollfd pfd;
     pfd.fd = s;
-    pfd.events = POLL_IN;
+    pfd.events = POLLIN;
     pfd.revents = 0;
     d_rfds.push_back(pfd);
   }
@@ -186,7 +186,7 @@ void UDPNameserver::bindIPv6()
     d_sockets.push_back(s);
     struct pollfd pfd;
     pfd.fd = s;
-    pfd.events = POLL_IN;
+    pfd.events = POLLIN;
     pfd.revents = 0;
     d_rfds.push_back(pfd);
     L<<Logger::Error<<"UDPv6 server bound to "<<locala.toStringWithPort()<<endl;
@@ -341,7 +341,7 @@ DNSPacket *UDPNameserver::receive(DNSPacket *prefilled)
   vector<struct pollfd> rfds= d_rfds;
   if(d_sockets.size()>1) {
     BOOST_FOREACH(struct pollfd &pfd, rfds) {
-      pfd.events = POLL_IN;
+      pfd.events = POLLIN;
       pfd.revents = 0;
     }
     
@@ -350,7 +350,7 @@ DNSPacket *UDPNameserver::receive(DNSPacket *prefilled)
       unixDie("Unable to poll for new UDP events");
     
     BOOST_FOREACH(struct pollfd &pfd, rfds) {
-      if(pfd.revents & POLL_IN) {
+      if(pfd.revents & POLLIN) {
         sock=pfd.fd;        
         len=0;