finish struct stat type cleanup Fix a build dependencies for the tdfx drm

    module

diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index 5f75745..b798da6 100644 (file)
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -171,11 +171,7 @@ static drmHashEntry *drmGetEntry(int fd)
 
 static int drmOpenDevice(long dev, int minor)
 {
-#ifdef XFree86LOADER
-    struct xf86stat st;
-#else
-    struct stat     st;
-#endif
+    stat_t          st;
     char            buf[64];
     int             fd;
     mode_t          dirmode = DRM_DEV_DIRMODE;

diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index 8df1f74..0e34d42 100644 (file)
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -59,7 +59,7 @@ GAMMAOBJS =   gamma_drv.o gamma_dma.o
 GAMMAHEADERS = gamma_drv.h $(DRMHEADERS) $(DRMTEMPLATES)
 
 TDFXOBJS =     tdfx_drv.o
-TDFXHEADERS =  tdfx.h $(DRMHEADERS)
+TDFXHEADERS =  tdfx.h $(DRMHEADERS) $(DRMTEMPLATES)
 
 R128OBJS =     r128_drv.o r128_cce.o r128_state.o
 R128HEADERS =  r128.h r128_drv.h r128_drm.h $(DRMHEADERS) $(DRMTEMPLATES)