diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-12 16:08:14 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-09-12 16:08:14 -0700 |
| commit | f801cf55bebc8d0d397fbe6db8cc91b3afb78149 (patch) | |
| tree | a45eaf32f0a057f7e4b3fb7db2333d9c84491b0c /libc/kernel/arch-arm/asm/socket.h | |
| parent | ccd7ee624a81d61675fa08e149fe190a317341eb (diff) | |
| parent | 47bda0c293c167f12ddde6e66192ad581c4a67e1 (diff) | |
| download | bionic-f801cf55bebc8d0d397fbe6db8cc91b3afb78149.zip bionic-f801cf55bebc8d0d397fbe6db8cc91b3afb78149.tar.gz bionic-f801cf55bebc8d0d397fbe6db8cc91b3afb78149.tar.bz2 | |
resolved conflicts for merge of 47bda0c2 to jb-mr1-dev
Change-Id: Ia1969c79111c006bde709920254a515646c20aa7
Diffstat (limited to 'libc/kernel/arch-arm/asm/socket.h')
| -rw-r--r-- | libc/kernel/arch-arm/asm/socket.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libc/kernel/arch-arm/asm/socket.h b/libc/kernel/arch-arm/asm/socket.h index a8c5000..0741bad 100644 --- a/libc/kernel/arch-arm/asm/socket.h +++ b/libc/kernel/arch-arm/asm/socket.h @@ -63,4 +63,17 @@ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define SO_PEERSEC 31 #define SO_PASSSEC 34 +#define SO_TIMESTAMPNS 35 +#define SCM_TIMESTAMPNS SO_TIMESTAMPNS +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define SO_MARK 36 +#define SO_TIMESTAMPING 37 +#define SCM_TIMESTAMPING SO_TIMESTAMPING +#define SO_PROTOCOL 38 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define SO_DOMAIN 39 +#define SO_RXQ_OVFL 40 +#define SO_WIFI_STATUS 41 +#define SCM_WIFI_STATUS SO_WIFI_STATUS +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif |