diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-27 21:38:44 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-27 21:38:44 +0200 |
| commit | a5352e212fcd4da83c8ff4fe542ef23c8e3187f8 (patch) | |
| tree | 016dd4cf4a39ddef717a1de7f7ace0305ffa0e75 /libc/sysdeps/linux/i386 | |
| parent | 91b2dfd68f5aecc290a449905aa7456f27f10326 (diff) | |
| parent | c6e8f34a358f846aa15cb9f53251da3d6668abd1 (diff) | |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'libc/sysdeps/linux/i386')
| -rw-r--r-- | libc/sysdeps/linux/i386/bits/fcntl.h | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/i386/bits/mathinline.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/i386/bits/fcntl.h b/libc/sysdeps/linux/i386/bits/fcntl.h index d48e62a2c..79b69d40c 100644 --- a/libc/sysdeps/linux/i386/bits/fcntl.h +++ b/libc/sysdeps/linux/i386/bits/fcntl.h @@ -99,6 +99,8 @@ # define F_NOTIFY 1026 /* Request notfications on a directory. */ # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with close-on-exit set on new fd. */ +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ #endif /* For F_[GET|SET]FD. */ diff --git a/libc/sysdeps/linux/i386/bits/mathinline.h b/libc/sysdeps/linux/i386/bits/mathinline.h index f8ec3a07d..b3a50a538 100644 --- a/libc/sysdeps/linux/i386/bits/mathinline.h +++ b/libc/sysdeps/linux/i386/bits/mathinline.h @@ -25,7 +25,7 @@ #ifdef __cplusplus # define __MATH_INLINE __inline #else -# define __MATH_INLINE extern __inline +# define __MATH_INLINE __extern_inline #endif |