Applied upstream.
This commit is contained in:
parent
05f65d930a
commit
b23265237f
1 changed files with 0 additions and 31 deletions
|
@ -1,31 +0,0 @@
|
|||
$NetBSD: patch-al,v 1.2 2008/01/31 17:07:40 bsadewitz Exp $
|
||||
|
||||
--- hw/xfree86/os-support/bsd/bsd_init.c.orig 2008-01-31 01:55:44.000000000 -0500
|
||||
+++ hw/xfree86/os-support/bsd/bsd_init.c
|
||||
@@ -159,7 +159,9 @@ xf86OpenConsole()
|
||||
xf86ConsOpen_t *driver;
|
||||
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
|
||||
int result;
|
||||
+#ifdef __FreeBSD__
|
||||
struct utsname uts;
|
||||
+#endif
|
||||
vtmode_t vtmode;
|
||||
#endif
|
||||
|
||||
@@ -250,6 +252,7 @@ xf86OpenConsole()
|
||||
#endif
|
||||
/* otherwise fall through */
|
||||
case PCVT:
|
||||
+#if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000))
|
||||
/*
|
||||
* First activate the #1 VT. This is a hack to allow a server
|
||||
* to be started while another one is active. There should be
|
||||
@@ -264,7 +267,7 @@ xf86OpenConsole()
|
||||
}
|
||||
sleep(1);
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
acquire_vt:
|
||||
/*
|
||||
* now get the VT
|
Loading…
Reference in a new issue