Move check definition MAP_FAILED in xf86_OSlib.h
Also remove odd definition MAP_FAILED. Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
parent
af56e502f5
commit
05b41e2dc6
|
@ -52,10 +52,6 @@
|
|||
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
|
||||
#endif
|
||||
|
||||
#ifndef MAP_FAILED
|
||||
#define MAP_FAILED ((caddr_t)-1)
|
||||
#endif
|
||||
|
||||
axpDevice bsdGetAXP(void);
|
||||
|
||||
#ifndef __NetBSD__
|
||||
|
|
|
@ -97,11 +97,6 @@ struct memAccess ioMemInfo = { CONSOLE_GET_IO_INFO, NULL, NULL,
|
|||
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
|
||||
#endif
|
||||
|
||||
#ifndef MAP_FAILED
|
||||
#define MAP_FAILED ((caddr_t)-1)
|
||||
#endif
|
||||
|
||||
|
||||
#define BUS_BASE 0L
|
||||
#define BUS_BASE_BWX 0L
|
||||
|
||||
|
|
|
@ -64,10 +64,6 @@
|
|||
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
|
||||
#endif
|
||||
|
||||
#ifndef MAP_FAILED
|
||||
#define MAP_FAILED ((caddr_t)-1)
|
||||
#endif
|
||||
|
||||
#ifdef __OpenBSD__
|
||||
#define SYSCTL_MSG "\tCheck that you have set 'machdep.allowaperture=1'\n"\
|
||||
"\tin /etc/sysctl.conf and reboot your machine\n" \
|
||||
|
|
|
@ -36,11 +36,6 @@
|
|||
|
||||
#include "bus/Pci.h"
|
||||
|
||||
#ifndef MAP_FAILED
|
||||
#define MAP_FAILED ((caddr_t)-1)
|
||||
#endif
|
||||
|
||||
|
||||
/***************************************************************************/
|
||||
/* Video Memory Mapping section */
|
||||
/***************************************************************************/
|
||||
|
|
|
@ -34,10 +34,6 @@
|
|||
#include "xf86_OSlib.h"
|
||||
#include "xf86OSpriv.h"
|
||||
|
||||
#ifndef MAP_FAILED
|
||||
#define MAP_FAILED ((caddr_t)-1)
|
||||
#endif
|
||||
|
||||
/***************************************************************************/
|
||||
/* Video Memory Mapping section */
|
||||
/***************************************************************************/
|
||||
|
|
|
@ -46,10 +46,6 @@
|
|||
#include <asm/mtrr.h>
|
||||
#endif
|
||||
|
||||
#ifndef MAP_FAILED
|
||||
#define MAP_FAILED ((void *)-1)
|
||||
#endif
|
||||
|
||||
static Bool ExtendedEnabled = FALSE;
|
||||
|
||||
#ifdef __ia64__
|
||||
|
|
|
@ -31,10 +31,6 @@
|
|||
#include "xf86Priv.h"
|
||||
#include "xf86_OSlib.h"
|
||||
|
||||
#ifndef MAP_FAILED
|
||||
#define MAP_FAILED ((void *)-1)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Read BIOS via mmap()ing DEV_MEM
|
||||
*/
|
||||
|
|
|
@ -363,6 +363,10 @@
|
|||
#define DEV_MEM "/dev/mem"
|
||||
#endif
|
||||
|
||||
#ifndef MAP_FAILED
|
||||
#define MAP_FAILED ((void *)-1)
|
||||
#endif
|
||||
|
||||
#define SYSCALL(call) while(((call) == -1) && (errno == EINTR))
|
||||
|
||||
#define XF86_OS_PRIVS
|
||||
|
|
Loading…
Reference in New Issue
Block a user