diff options
Diffstat (limited to 'hw/xfree86/os-support/solaris/sun_init.c')
| -rw-r--r-- | hw/xfree86/os-support/solaris/sun_init.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index c7fac524f..1f389cb40 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -29,7 +29,7 @@ #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" -#if defined(__i386__) || defined(__x86) +#if defined(__i386__) || defined(__i386) || defined(__x86) # include <sys/kd.h> #endif @@ -40,7 +40,7 @@ static int VTnum = -1; static int xf86StartVT = -1; #endif -#if defined(__SOL8__) || !defined(__i386__) +#if defined(__SOL8__) || (!defined(__i386__) && !defined(__i386)) static char fb_dev[PATH_MAX] = "/dev/fb"; #else static char fb_dev[PATH_MAX] = "/dev/console"; @@ -209,11 +209,8 @@ xf86CloseConsole(void) #ifdef HAS_USL_VTS struct vt_mode VT; #endif -#if defined(__SOL8__) || !defined(__i386__) - int tmp; -#endif -#if !defined(__i386__) && !defined(__x86) +#if !defined(__i386__) && !defined(__i386) && !defined(__x86) if (!xf86DoProbe && !xf86DoConfigure) { int fd; @@ -332,7 +329,7 @@ xf86ProcessArgument(int argc, char **argv, int i) #endif /* HAS_USL_VTS */ -#if defined(__SOL8__) || !defined(__i386__) +#if defined(__SOL8__) || (!defined(__i386__) && !defined(__i386)) if ((i + 1) < argc) { if (!strcmp(argv[i], "-dev")) { |