diff options
| author | Kevin E Martin <kem@kem.org> | 2001-04-05 20:57:37 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2001-04-05 20:57:37 +0000 |
| commit | 84eb47efbeaa07dd7526383b10234389a003d90b (patch) | |
| tree | af1e718f29c3dfca0e577bb0f4d211c6432600e6 /libdrm | |
| parent | 2673fcbaaef60aa9f1258a24f3b678d3b1861c73 (diff) | |
- Merge from trunk into pcigart branchati-pcigart-1-0-0-20010405ati-pcigart-1-0-0-branch
Diffstat (limited to 'libdrm')
| -rw-r--r-- | libdrm/xf86drm.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index 404840cd..bb719edb 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c @@ -35,11 +35,9 @@ # include "xf86.h" # include "xf86_OSproc.h" # include "xf86_ansic.h" -# include "xf86Priv.h" # define _DRM_MALLOC xalloc # define _DRM_FREE xfree # ifndef XFree86LOADER -# include <sys/stat.h> # include <sys/mman.h> # endif #else @@ -53,6 +51,7 @@ # include <signal.h> # include <sys/types.h> # include <sys/stat.h> +# define stat_t struct stat # include <sys/ioctl.h> # include <sys/mman.h> # include <sys/time.h> @@ -136,11 +135,7 @@ static char *drmStrdup(const char *s) static unsigned long drmGetKeyFromFd(int fd) { -#ifdef XFree86LOADER - struct xf86stat st; -#else - struct stat st; -#endif + stat_t st; st.st_rdev = 0; fstat(fd, &st); @@ -169,11 +164,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; @@ -220,7 +211,7 @@ static int drmOpenDevice(long dev, int minor) return -errno; } -int drmOpenMinor(int minor, int create) +static int drmOpenMinor(int minor, int create) { int fd; char buf[64]; |