*** ./unix/tx/TXDialog.h.ORG	Thu Jun 21 09:21:46 2007
--- ./unix/tx/TXDialog.h	Thu Jun 21 09:23:45 2007
***************
*** 30,35 ****
--- 30,40 ----
  
  #include "TXWindow.h"
  #include <errno.h>
+ #if defined(__NetBSD__)
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+ #endif
  
  class TXDialog : public TXWindow, public TXDeleteWindowCallback {
  public:
*** ./unix/xc/programs/Xserver/vnc/Xvnc/Imakefile.ORG	Thu Jun 21 16:35:37 2007
--- ./unix/xc/programs/Xserver/vnc/Xvnc/Imakefile	Fri Jun 22 12:42:25 2007
***************
*** 3,9 ****
     VNCINCLUDE = -I$(VNCCOMMONDIR)
        VNCLIBS = VncExtLibs
  
! #if defined(XFree86Version) && XFree86Version < 4000
     VNCDEFINES = -DNO_INIT_BACKING_STORE
  #endif
  
--- 3,9 ----
     VNCINCLUDE = -I$(VNCCOMMONDIR)
        VNCLIBS = VncExtLibs
  
! #if (defined(XFree86Version) && XFree86Version < 4000) || defined(MIPSEL)
     VNCDEFINES = -DNO_INIT_BACKING_STORE
  #endif
  
*** ./unix/xc/programs/Xserver/vnc/vncHooks.cc.ORG	Thu Jun 21 12:49:08 2007
--- ./unix/xc/programs/Xserver/vnc/vncHooks.cc	Thu Jun 21 12:52:14 2007
***************
*** 102,109 ****
--- 102,114 ----
  static void vncHooksStoreColors(ColormapPtr pColormap, int ndef,
                                  xColorItem* pdef);
  static Bool vncHooksDisplayCursor(ScreenPtr pScreen, CursorPtr cursor);
+ #if defined(__NetBSD__)
+ static void vncHooksBlockHandler(int i, pointer blockData, timeval ** pTimeout,
+                                  pointer pReadmask);
+ #else
  static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
                                   pointer pReadmask);
+ #endif
  
  // GC "funcs"
  
***************
*** 456,463 ****
--- 461,473 ----
  // BlockHandler - ignore any changes during the block handler - it's likely
  // these are just drawing the cursor.
  
+ #if defined(__NetBSD__)
+ static void vncHooksBlockHandler(int i, pointer blockData, timeval ** pTimeout,
+                                  pointer pReadmask)
+ #else
  static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
                                   pointer pReadmask)
+ #endif
  {
    SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler);