Bug 655986 - Remove POLL_WITH_XCONNECTIONNUMBER since no longer defined; r=roc

widget/src/gtk2/nsClipboard.cpp

@@ -60,10 +60,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef POLL_WITH_XCONNECTIONNUMBER
-#include <poll.h>
-#endif
-
 // Callback when someone asks us for the data
 void
 clipboard_get_cb(GtkClipboard *aGtkClipboard,
@@ -915,18 +911,12 @@ wait_for_retrieval(GtkClipboard *clipboard, retrieval_context *r_context)
 
     int select_result;
 
-#ifdef POLL_WITH_XCONNECTIONNUMBER
-    struct pollfd fds[1];
-    fds[0].fd = XConnectionNumber(xDisplay);
-    fds[0].events = POLLIN;
-#else
     int cnumber = ConnectionNumber(xDisplay);
     fd_set select_set;
     FD_ZERO(&select_set);
     FD_SET(cnumber, &select_set);
     ++cnumber;
     struct timeval tv;
-#endif
 
     do {
         XEvent xevent;
@@ -943,13 +933,10 @@ wait_for_retrieval(GtkClipboard *clipboard, retrieval_context *r_context)
                 return PR_TRUE;
         }
 
-#ifdef POLL_WITH_XCONNECTIONNUMBER
-        select_result = poll(fds, 1, kClipboardTimeout / 1000);
-#else
         tv.tv_sec = 0;
         tv.tv_usec = kClipboardTimeout;
         select_result = select(cnumber, &select_set, NULL, NULL, &tv);
-#endif
+
     } while (select_result == 1);
 
 #ifdef DEBUG_CLIPBOARD

widget/src/xremoteclient/XRemoteClient.cpp

@@ -55,9 +55,6 @@
 #include <unistd.h>
 #include <limits.h>
 #include <X11/Xatom.h>
-#ifdef POLL_WITH_XCONNECTIONNUMBER
-#include <poll.h>
-#endif
 
 #define MOZILLA_VERSION_PROP   "_MOZILLA_VERSION"
 #define MOZILLA_LOCK_PROP      "_MOZILLA_LOCK"
@@ -428,12 +425,6 @@ XRemoteClient::GetLock(Window aWindow, PRBool *aDestroyed)
       while (1) {
 	XEvent event;
 	int select_retval;
-#ifdef POLL_WITH_XCONNECTIONNUMBER
-       struct pollfd fds[1];
-       fds[0].fd = XConnectionNumber(mDisplay);
-       fds[0].events = POLLIN;
-       select_retval = poll(fds,1,10*1000);
-#else
 	fd_set select_set;
 	struct timeval delay;
 	delay.tv_sec = 10;
@@ -444,7 +435,6 @@ XRemoteClient::GetLock(Window aWindow, PRBool *aDestroyed)
 	FD_SET(ConnectionNumber(mDisplay), &select_set);
 	select_retval = select(ConnectionNumber(mDisplay) + 1,
 			       &select_set, NULL, NULL, &delay);
-#endif
 	// did we time out?
 	if (select_retval == 0) {
 	  PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("timed out waiting for window\n"));