frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: os-support: unexport DEV_MEM defines 

DEV_MEM define isn't used by any drivers, and BSD seems to be the only one
left using that define (Linux uses the symbol, but defines on its own)

Therefore, just define it where actually used and drop it from the global
xf86OSlib.h file.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1411>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-15 17:18:07 +01:00 committed by Marge Bot
parent d79432e0d4
commit 923da4d569
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/os-support/bsd/alpha_video.c
View File

@ -42,6 +42,8 @@
#include "xf86_os_support.h" #include "xf86_os_support.h"
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#define DEV_MEM "/dev/mem"
#if defined(__NetBSD__) && !defined(MAP_FILE) #if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED #define MAP_FLAGS MAP_SHARED
#else #else

2
hw/xfree86/os-support/bsd/arm_video.c
View File

@ -70,6 +70,8 @@
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#include "compiler.h" #include "compiler.h"
#define DEV_MEM "/dev/mem"
#if defined(__NetBSD__) && !defined(MAP_FILE) #if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED #define MAP_FLAGS MAP_SHARED
#else #else

2
hw/xfree86/os-support/bsd/i386_video.c
View File

@ -40,6 +40,8 @@
#include <machine/sysarch.h> #include <machine/sysarch.h>
#endif #endif
#define DEV_MEM "/dev/mem"
#if defined(__NetBSD__) && !defined(MAP_FILE) #if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED #define MAP_FLAGS MAP_SHARED
#else #else

4
hw/xfree86/os-support/xf86_OSlib.h
View File

@ -230,10 +230,6 @@ struct pcvtid {
#include <limits.h> #include <limits.h>
#ifndef DEV_MEM
#define DEV_MEM "/dev/mem"
#endif
#ifndef MAP_FAILED #ifndef MAP_FAILED
#define MAP_FAILED ((void *)-1) #define MAP_FAILED ((void *)-1)
#endif #endif