Merge of branches/team/network/new_stack - not yet complete as SVN does only support

replacing files when merging when you don't have deleted them manually (for some reason,
it only works as part of the merge operation, and we didn't copy the whole tree to
have "a fresh start" - next time we know better, at least if SVN still suffers from
that same limitation).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18456 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/posix/sys/ioctl.h

@@ -1,39 +1,12 @@
-/**
- * @file sys/ioctl.h
- * @brief I/O control functions
+/*
+ * Copyright 2006, Haiku Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
  */
-
 #ifndef _SYS_IOCTL_H
 #define _SYS_IOCTL_H
 
-/**
- * @defgroup IOCTL sys/ioctl.h
- * @brief I/O control functions
- * @ingroup OpenBeOS_POSIX
- * @{
- */
+/* These only work on sockets for now */
+#define FIONBIO 	0xbe000000
+#define FIONREAD	0xbe000001
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/ioccom.h>
-#include <sys/filio.h>
-#include <sys/socket.h>
-
-#ifndef _KERNEL_MODE
-  /** @fn int ioctl(int fd, ulong cmd, ...)
-   * Manipulates the characteristics of the affected descriptor. May be used
-   * on all forms of descriptor, including sockets and pipes. cmd should be one
-   * of the values given in 
-   * @ref IOCTL_cmds
-   */
-  int ioctl(int, ulong, ...);
-#endif /* !_KERNEL_MODE */
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */
-#endif /* _SYS_IOCTL_H */
+#endif	/* _SYS_IOCTL_H */