commit 6b5a1a580d463ebf7fea4ba31f4cf0a75105d2af
author Nick Kralevich <nnk@google.com> Wed Oct 17 17:28:15 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 17 17:28:15 2018 -0700
tree 3398a959be3765929ae33fbf38fb921559c7df28
parent c9303ea392d2be09980ddb73f0f964a831fcc55e
parent 063068f8c8f37c87fbe7dea0afeaa1f68cb29a58

Merge "FIONCLEX: fix MIPS ioctl number" am: afdcd959d7
am: 063068f8c8

Change-Id: I50c61f6bdc2712b2ab0baaaabc6f1090b8efdb9d

public/ioctl_defines

diff --git a/public/ioctl_defines b/public/ioctl_defines
index cbf4903..a463023 100644
--- a/public/ioctl_defines
+++ b/public/ioctl_defines
@@ -791,7 +791,7 @@
 define(`FIOCLEX', ifelse(target_arch, mips, 0x00006601, 0x00005451))
 define(`FIOGETOWN', `0x00008903')
 define(`FIONBIO', `0x00005421')
-define(`FIONCLEX', `0x00005450')
+define(`FIONCLEX', ifelse(target_arch, mips, 0x00006602, 0x00005450))
 define(`FIONREAD', ifelse(target_arch, mips, 0x0000467f, 0x0000541b))
 define(`FIOQSIZE', `0x00005460')
 define(`FIOSETOWN', `0x00008901')