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/sparc | |
parent | 91b2dfd68f5aecc290a449905aa7456f27f10326 (diff) | |
parent | c6e8f34a358f846aa15cb9f53251da3d6668abd1 (diff) |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'libc/sysdeps/linux/sparc')
-rw-r--r-- | libc/sysdeps/linux/sparc/bits/fcntl.h | 2 | ||||
-rw-r--r-- | libc/sysdeps/linux/sparc/bits/mathinline.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/sparc/bits/fcntl.h b/libc/sysdeps/linux/sparc/bits/fcntl.h index 235d2adde..7e80d9e45 100644 --- a/libc/sysdeps/linux/sparc/bits/fcntl.h +++ b/libc/sysdeps/linux/sparc/bits/fcntl.h @@ -106,6 +106,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 #if __WORDSIZE == 64 diff --git a/libc/sysdeps/linux/sparc/bits/mathinline.h b/libc/sysdeps/linux/sparc/bits/mathinline.h index b642c83f5..ccc84bcc2 100644 --- a/libc/sysdeps/linux/sparc/bits/mathinline.h +++ b/libc/sysdeps/linux/sparc/bits/mathinline.h @@ -130,7 +130,7 @@ # ifdef __cplusplus # define __MATH_INLINE __inline # else -# define __MATH_INLINE extern __inline +# define __MATH_INLINE __extern_inline # endif /* __cplusplus */ /* The gcc, version 2.7 or below, has problems with all this inlining |