xnu-6153.41.3.tar.gz

[apple/xnu.git] / bsd / sys / ioctl.h

diff --git a/bsd/sys/ioctl.h b/bsd/sys/ioctl.h
index 38aea03bdcf70998de9dc8bce28751a697164bb3..4ad48128604d01337f0dae5c11ae3fd8f04fd555 100644 (file)
--- a/bsd/sys/ioctl.h
+++ b/bsd/sys/ioctl.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */


@@ -66,8 +66,8 @@
  *     @(#)ioctl.h     8.6 (Berkeley) 3/28/94
  */
 
  *     @(#)ioctl.h     8.6 (Berkeley) 3/28/94
  */
 

-#ifndef        _SYS_IOCTL_H_
-#define        _SYS_IOCTL_H_
+#ifndef _SYS_IOCTL_H_
+#define _SYS_IOCTL_H_

 
 #include <sys/ttycom.h>
 
 
 #include <sys/ttycom.h>
 


@@ -77,13 +77,13 @@
  * nonwithstanding).
  */
 struct ttysize {
  * nonwithstanding).
  */
 struct ttysize {

-       unsigned short  ts_lines;
-       unsigned short  ts_cols;
-       unsigned short  ts_xxx;
-       unsigned short  ts_yyy;
+       unsigned short  ts_lines;
+       unsigned short  ts_cols;
+       unsigned short  ts_xxx;
+       unsigned short  ts_yyy;

 };
 };

-#define        TIOCGSIZE       TIOCGWINSZ
-#define        TIOCSSIZE       TIOCSWINSZ
+#define TIOCGSIZE       TIOCGWINSZ
+#define TIOCSSIZE       TIOCSWINSZ

 
 #include <sys/ioccom.h>
 
 
 #include <sys/ioccom.h>
 


@@ -95,7 +95,7 @@ struct ttysize {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS

-int    ioctl(int, unsigned long, ...);
+int     ioctl(int, unsigned long, ...);

 __END_DECLS
 #endif /* !KERNEL */
 #endif /* !_SYS_IOCTL_H_ */
 __END_DECLS
 #endif /* !KERNEL */
 #endif /* !_SYS_IOCTL_H_ */


@@ -107,6 +107,6 @@ __END_DECLS
  * Source level -> #define USE_OLD_TTY
  * Kernel level -> always on
  */
  * Source level -> #define USE_OLD_TTY
  * Kernel level -> always on
  */

-#if defined(USE_OLD_TTY) || BSD_KERNEL_PRIVATE
+#if defined(USE_OLD_TTY) || defined(BSD_KERNEL_PRIVATE)

 #include <sys/ioctl_compat.h>
 #endif /* !_SYS_IOCTL_H_ */
 #include <sys/ioctl_compat.h>
 #endif /* !_SYS_IOCTL_H_ */