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

Convert Solaris #ifdef's for <sys/kd.h> to AC_CHECK_HEADERS check 

Upcoming virtual terminal support changes in Solaris kernel will provide
<sys/kd.h> on SPARC too, so this gets us ready for them.
This commit is contained in:
Alan Coopersmith 2008-08-22 10:14:11 -07:00
parent 95b466e457
commit cc78d977ca
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -1280,6 +1280,7 @@ if test "x$XORG" = xyes; then
solaris*) solaris*)
XORG_OS="solaris" XORG_OS="solaris"
XORG_OS_SUBDIR="solaris" XORG_OS_SUBDIR="solaris"
AC_CHECK_HEADERS([sys/kd.h])
# This really should be tests for specific features, but the #ifdef's # This really should be tests for specific features, but the #ifdef's
# were done as a simple version check in XFree86 4.x and haven't been # were done as a simple version check in XFree86 4.x and haven't been
# fixed yet # fixed yet

2
hw/xfree86/os-support/solaris/sun_init.c
View File

@ -29,7 +29,7 @@
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#if defined(__i386__) || defined(__i386) || defined(__x86) #ifdef HAVE_SYS_KD_H
# include <sys/kd.h> # include <sys/kd.h>
#endif #endif

3
include/xorg-config.h.in
View File

@ -54,6 +54,9 @@
/* Solaris 8 or later? */ /* Solaris 8 or later? */
#undef __SOL8__ #undef __SOL8__
/* Define to 1 if you have the <sys/kd.h> header file. */
#undef HAVE_SYS_KD_H
/* Define to 1 if you have the `walkcontext' function (used on Solaris for /* Define to 1 if you have the `walkcontext' function (used on Solaris for
xorg_backtrace in hw/xfree86/common/xf86Events.c */ xorg_backtrace in hw/xfree86/common/xf86Events.c */
#undef HAVE_WALKCONTEXT #undef HAVE_WALKCONTEXT