xnu-6153.101.6.tar.gz

[apple/xnu.git] / libsyscall / wrappers / ioctl.c

diff --git a/libsyscall/wrappers/ioctl.c b/libsyscall/wrappers/ioctl.c
index eced7e7e16792c12874796e9f885b4eee211dbff..71fa3e21b89381cc1994fc14ec7587527ae74248 100644 (file)
--- a/libsyscall/wrappers/ioctl.c
+++ b/libsyscall/wrappers/ioctl.c
@@ -2,14 +2,14 @@
  * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_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
  * compliance with the License. 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,
@@ -17,11 +17,11 @@
  * 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_LICENSE_HEADER_END@
  */
 
-#if defined(__LP64__) || defined(__arm__)
+#if !defined(__i386__)
 
 #include <sys/ioctl.h>
 #include <stdarg.h>
@@ -29,19 +29,17 @@
 int __ioctl(int, unsigned long, void *);
 /*
  * Stub function to account for the third argument being void *
- *
- * This is for LP64 only.
  */
 int
 ioctl(int d, unsigned long request, ...)
 {
-       va_list ap;
+       va_list ap;
        void *arg;
 
        va_start(ap, request);
        arg = va_arg(ap, void *);
        va_end(ap);
-       return (__ioctl(d, request, arg));
+       return __ioctl(d, request, arg);
 }
 
 #endif