am 22cf36af: am 7e12e6af: am 5b191604: Merge "Add SOCK_CLOEXEC and SOCK_NONBLOCK socket flags."

* commit '22cf36af18993e78dbeaaeee9cfa90b975452be2':
  Add SOCK_CLOEXEC and SOCK_NONBLOCK socket flags.
This commit is contained in:
Elliott Hughes 2013-10-17 14:40:43 -07:00 committed by Android Git Automerger
commit 1bd510e1d3

View File

@ -25,6 +25,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _SYS_SOCKET_H_
#define _SYS_SOCKET_H_
@ -32,6 +33,7 @@
#include <sys/types.h>
#include <linux/socket.h>
#include <asm/fcntl.h>
#include <asm/socket.h>
#include <linux/sockios.h>
#include <linux/uio.h>
@ -61,13 +63,15 @@ typedef int socklen_t;
#define SOCK_PACKET 10
#endif
/* BIONIC: second argument to shutdown() */
#define SOCK_CLOEXEC O_CLOEXEC
#define SOCK_NONBLOCK O_NONBLOCK
enum {
SHUT_RD = 0, /* no more receptions */
SHUT_RD = 0,
#define SHUT_RD SHUT_RD
SHUT_WR, /* no more transmissions */
SHUT_WR,
#define SHUT_WR SHUT_WR
SHUT_RDWR /* no more receptions or transmissions */
SHUT_RDWR
#define SHUT_RDWR SHUT_RDWR
};