svn commit: r191936 - in head: sys/sys usr.bin/kdump

[Ed Schouten]

Author: ed
Date: Sat May  9 15:09:40 2009
New Revision: 191936
URL: http://svn.freebsd.org/changeset/base/191936

Log:
  Add support for old TTY ioctls to kdump.
  
  At first I allowed ioctl_compat.h to be included, but it just returned
  an empty file. I had to do this, to keep kdump happy. I really want to
  raise a compiler error when including this header, so now it will just
  throw an error if you don't set COMPAT_43TTY.

Modified:
  head/sys/sys/ioctl_compat.h
  head/usr.bin/kdump/mkioctls

Modified: head/sys/sys/ioctl_compat.h
==============================================================================
--- head/sys/sys/ioctl_compat.h	Sat May  9 08:30:44 2009	(r191935)
+++ head/sys/sys/ioctl_compat.h	Sat May  9 15:09:40 2009	(r191936)
@@ -38,8 +38,6 @@
 #ifndef _SYS_IOCTL_COMPAT_H_
 #define	_SYS_IOCTL_COMPAT_H_
 
-#ifdef _KERNEL
-
 #ifndef COMPAT_43TTY
 #error "Definitions not available without TTY ioctl compat."
 #endif
@@ -151,6 +149,4 @@ struct sgttyb {
 #define	TIOCGLTC	_IOR('t',116,struct ltchars)/* get local special chars*/
 #define OTIOCCONS	_IO('t', 98)	/* for hp300 -- sans int arg */
 
-#endif /* _KERNEL */
-
 #endif /* !_SYS_IOCTL_COMPAT_H_ */

Modified: head/usr.bin/kdump/mkioctls
==============================================================================
--- head/usr.bin/kdump/mkioctls	Sat May  9 08:30:44 2009	(r191935)
+++ head/usr.bin/kdump/mkioctls	Sat May  9 15:09:40 2009	(r191936)
@@ -37,6 +37,7 @@ awk -v x="$ioctl_includes" 'BEGIN {print
 BEGIN {
 	print "/* XXX obnoxious prerequisites. */"
 	print "#define COMPAT_43"
+	print "#define COMPAT_43TTY"
 	print "#include <sys/param.h>"
 	print "#include <sys/devicestat.h>"
 	print "#include <sys/disklabel.h>"