Module Name: src
Committed By: pgoyette
Date: Thu Mar 8 08:55:52 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: tty_60.c
Log Message:
We don't need to conditionalize the code on COMPAT_60 since we'll
only include the source file when COMPAT_60 is requested (either
by kernel option or module specification)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.16.1 src/sys/compat/common/tty_60.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/tty_60.c
diff -u src/sys/compat/common/tty_60.c:1.4 src/sys/compat/common/tty_60.c:1.4.16.1
--- src/sys/compat/common/tty_60.c:1.4 Thu Oct 22 15:18:25 2015
+++ src/sys/compat/common/tty_60.c Thu Mar 8 08:55:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_60.c,v 1.4 2015/10/22 15:18:25 christos Exp $ */
+/* $NetBSD: tty_60.c,v 1.4.16.1 2018/03/08 08:55:52 pgoyette Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.4 2015/10/22 15:18:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.4.16.1 2018/03/08 08:55:52 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -45,8 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1
#include <sys/tty.h>
#include <compat/sys/ttycom.h>
-#ifdef COMPAT_60
-
/* convert struct ptmget to struct compat_60_ptmget */
static int
ptmget_to_ptmget60(struct ptmget *pg, struct compat_60_ptmget *pg60)
@@ -116,5 +114,3 @@ compat_60_ptmioctl(dev_t dev, u_long cmd
return EPASSTHROUGH;
}
}
-
-#endif /* COMPAT_60 */
