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

xfree86: os-support: move _NEED_SYSI86 guarded block to sun_vid.c 

The sun_vid.c driver seems to be the only actual consumer left, so it
can be dropped from public headers and moved to sun_vid.c instead.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1414>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-18 14:26:45 +01:00 committed by Alan Coopersmith
parent 1073ca2b8a
commit dee16edd2e
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xfree86/os-support/solaris/sun_vid.c
View File

@ -51,8 +51,11 @@
#include <sys/types.h> /* get __x86 definition if not set by compiler */ #include <sys/types.h> /* get __x86 definition if not set by compiler */
#if defined(__i386__) || defined(__i386) || defined(__x86) #if defined(__i386__) || defined(__i386) || defined(__x86)
#define _NEED_SYSI86 #include <sys/tss.h>
#endif #include <sys/sysi86.h>
#include <sys/psw.h>
#endif /* defined(__i386__) || defined(__i386) || defined(__x86) */
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86_OSlib.h" #include "xf86_OSlib.h"

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

@ -93,22 +93,6 @@
#include <errno.h> #include <errno.h>
#if defined(_NEED_SYSI86)
#if !(defined (__sun) && defined (SVR4))
#include <sys/immu.h>
#include <sys/region.h>
#include <sys/proc.h>
#endif
#include <sys/tss.h>
#include <sys/sysi86.h>
#if defined(SVR4) && !defined(__sun)
#include <sys/seg.h>
#endif /* SVR4 && !__sun */
#if defined(__sun) && (defined (__i386__) || defined(__i386) || defined(__x86)) && defined (SVR4)
#include <sys/psw.h>
#endif
#endif /* _NEED_SYSI86 */
#if !defined(__sun) || defined(HAVE_SYS_VT_H) #if !defined(__sun) || defined(HAVE_SYS_VT_H)
#define HAS_USL_VTS #define HAS_USL_VTS
#endif #endif