Make the test programs build

tests/dristat.c

@@ -30,10 +30,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "../../../xf86drm.h"
-#include "../xf86drmRandom.c"
-#include "../xf86drmHash.c"
-#include "../xf86drm.c"
+#include "xf86drm.h"
+#include "xf86drmRandom.c"
+#include "xf86drmHash.c"
+#include "xf86drm.c"
 
 #define DRM_VERSION 0x00000001
 #define DRM_MEMORY  0x00000002

tests/drmstat.c

@@ -85,7 +85,7 @@ void process_sigio(char *device)
     }
 
     sigio_fd = fd;
-    drmInstallSIGIOHandler(fd, handler);
+    /*  drmInstallSIGIOHandler(fd, handler); */
     for (;;) sleep(60);
 }
 
@@ -94,13 +94,13 @@ int main(int argc, char **argv)
     int            c;
     int            r  = 0;
     int            fd = -1;
-    drmHandle      handle;
+    drm_handle_t      handle;
     void           *address;
     char           *pt;
     unsigned long  count;
     unsigned long  offset;
     unsigned long  size;
-    drmContext     context;
+    drm_context_t  context;
     int            loops;
     char           buf[1024];
     int            i;