geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Move xf86ConfigDRI declaration from xf86Priv.h to xf86.h. 

- Don't include xf86Priv.h in the drm module.
- Fix 'struct stat' in loader libc wrapping to avoid unnecessary
    XFree86LOADER #ifdefs in code that uses it.
- Make drmOpenMinor() static.
main
David Dawes 2001-03-30 17:16:20 +00:00
parent e407c2f5a6
commit fcc21069b7
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libdrm/xf86drm.c
View File

@ -35,11 +35,9 @@
# include "xf86.h" # include "xf86.h"
# include "xf86_OSproc.h" # include "xf86_OSproc.h"
# include "xf86_ansic.h" # include "xf86_ansic.h"
# include "xf86Priv.h"
# define _DRM_MALLOC xalloc # define _DRM_MALLOC xalloc
# define _DRM_FREE xfree # define _DRM_FREE xfree
# ifndef XFree86LOADER # ifndef XFree86LOADER
# include <sys/stat.h>
# include <sys/mman.h> # include <sys/mman.h>
# endif # endif
#else #else
@ -53,6 +51,7 @@
# include <signal.h> # include <signal.h>
# include <sys/types.h> # include <sys/types.h>
# include <sys/stat.h> # include <sys/stat.h>
# define stat_t struct stat
# include <sys/ioctl.h> # include <sys/ioctl.h>
# include <sys/mman.h> # include <sys/mman.h>
# include <sys/time.h> # include <sys/time.h>
@ -141,11 +140,7 @@ static char *drmStrdup(const char *s)
static unsigned long drmGetKeyFromFd(int fd) static unsigned long drmGetKeyFromFd(int fd)
{ {
#ifdef XFree86LOADER stat_t st;
struct xf86stat st;
#else
struct stat st;
#endif
st.st_rdev = 0; st.st_rdev = 0;
fstat(fd, &st); fstat(fd, &st);
@ -174,11 +169,7 @@ static drmHashEntry *drmGetEntry(int fd)
static int drmOpenDevice(long dev, int minor) static int drmOpenDevice(long dev, int minor)
{ {
#ifdef XFree86LOADER stat_t st;
struct xf86stat st;
#else
struct stat st;
#endif
char buf[64]; char buf[64];
int fd; int fd;
mode_t dirmode = DRM_DEV_DIRMODE; mode_t dirmode = DRM_DEV_DIRMODE;
@ -225,7 +216,7 @@ static int drmOpenDevice(long dev, int minor)
return -errno; return -errno;
} }
int drmOpenMinor(int minor, int create) static int drmOpenMinor(int minor, int create)
{ {
int fd; int fd;
char buf[64]; char buf[64];