diff -urN xproto/Xpoll.h.in xproto-7.0.10/Xpoll.h.in
--- xproto/Xpoll.h.in	Wed May  7 18:28:47 2008
+++ xproto-7.0.10/Xpoll.h.in	Wed Sep 20 15:59:42 2006
@@ -96,15 +96,7 @@
 # endif
 #endif
 
-#ifdef PLAN9
-typedef long fd_mask;
-#endif
-
-#ifdef PLAN9
-#define XFD_SETSIZE	FD_SETSIZE
-#else
 #define XFD_SETSIZE	256
-#endif
 
 #ifndef FD_SETSIZE
 #define FD_SETSIZE	XFD_SETSIZE
@@ -164,9 +156,6 @@
  * array. before accessing an element in the array we check it exists.
  * If it does not exist then the compiler discards the code to access it. 
  */
-#ifdef PLAN9
-#define	XFD_ANYSET FD_ANYSET
-#else
 #define XFD_ANYSET(p) \
         ((howmany(FD_SETSIZE, NFDBITS) > 0 && (__XFDS_BITS(p, 0))) || \
         (howmany(FD_SETSIZE, NFDBITS) > 1 && (__XFDS_BITS(p, 1))) || \
@@ -176,7 +165,6 @@
         (howmany(FD_SETSIZE, NFDBITS) > 5 && (__XFDS_BITS(p, 5))) || \
         (howmany(FD_SETSIZE, NFDBITS) > 6 && (__XFDS_BITS(p, 6))) || \
         (howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))))
-#endif /* PLAN9 */
 
 #define XFD_COPYSET(src,dst) { \
         int __i__; \