From 06d4db071bd55df3a7cb2c751c6a7612d6e1d660 Mon Sep 17 00:00:00 2001
From: Frank Benkstein <frank-vlock@benkstein.net>
Date: Sat, 18 Aug 2007 20:22:56 +0200
Subject: [PATCH] fix build on Debian/kFreeBSD

patch from http://article.gmane.org/gmane.linux.debian.devel.bugs.general/292406
---
 src/vlock-all.c |  4 ++--
 src/vlock-new.c | 10 +++++-----
 src/vlock.h     |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/vlock-all.c b/src/vlock-all.c
index 5946a9a..22da509 100644
--- a/src/vlock-all.c
+++ b/src/vlock-all.c
@@ -20,11 +20,11 @@
 #include <errno.h>
 #include <signal.h>
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/consio.h>
 #else
 #include <sys/vt.h>
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD__, __FreeBSD_kernel__ */
 
 #include "vlock.h"
 
diff --git a/src/vlock-new.c b/src/vlock-new.c
index 1ea4495..f75f3b9 100644
--- a/src/vlock-new.c
+++ b/src/vlock-new.c
@@ -19,18 +19,18 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/consio.h>
 #else
 #include <sys/vt.h>
-#endif /* __FreeBSD__ */
+#endif /* __FreeBSD__, __FreeBSD_kernel__ */
 
 #include "vlock.h"
 
 /* Get the currently active console from the given
  * console file descriptor.  Returns console number
  * (starting from 1) on success, -1 on error. */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 static int get_active_console(int consfd) {
   int n;
 
@@ -61,7 +61,7 @@ static char *get_console_name(int n) {
     return NULL;
 
   /* format the virtual terminal filename from the number */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
   namelen = snprintf(name, sizeof name, VTNAME, n-1);
 #else
   namelen = snprintf(name, sizeof name, VTNAME, n);
@@ -179,7 +179,7 @@ int main(void) {
       || ioctl(consfd, VT_WAITACTIVE, old_vtno) < 0)
     perror("vlock-new: could not activate previous console");
 
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
   /* deallocate virtual terminal */
   if (ioctl(consfd, VT_DISALLOCATE, vtno) < 0)
     perror("vlock-new: could not disallocate console");
diff --git a/src/vlock.h b/src/vlock.h
index faaddce..15395af 100644
--- a/src/vlock.h
+++ b/src/vlock.h
@@ -11,13 +11,13 @@
  */
 
 /* name of the virtual console device */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #define CONSOLE "/dev/ttyv0"
 #else
 #define CONSOLE "/dev/tty0"
 #endif
 /* template for the device of a given virtual console */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #define VTNAME "/dev/ttyv%x"
 #else
 #define VTNAME "/dev/tty%d"
-- 
2.11.4.GIT