summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux/mips
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-08-27 21:38:44 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-08-27 21:38:44 +0200
commita5352e212fcd4da83c8ff4fe542ef23c8e3187f8 (patch)
tree016dd4cf4a39ddef717a1de7f7ace0305ffa0e75 /libc/sysdeps/linux/mips
parent91b2dfd68f5aecc290a449905aa7456f27f10326 (diff)
parentc6e8f34a358f846aa15cb9f53251da3d6668abd1 (diff)
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'libc/sysdeps/linux/mips')
-rw-r--r--libc/sysdeps/linux/mips/bits/fcntl.h2
-rw-r--r--libc/sysdeps/linux/mips/sys/tas.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/mips/bits/fcntl.h b/libc/sysdeps/linux/mips/bits/fcntl.h
index 4291f6e4c..8c4c1150a 100644
--- a/libc/sysdeps/linux/mips/bits/fcntl.h
+++ b/libc/sysdeps/linux/mips/bits/fcntl.h
@@ -111,6 +111,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]FL. */
diff --git a/libc/sysdeps/linux/mips/sys/tas.h b/libc/sysdeps/linux/mips/sys/tas.h
index 8d1141464..f00ebab95 100644
--- a/libc/sysdeps/linux/mips/sys/tas.h
+++ b/libc/sysdeps/linux/mips/sys/tas.h
@@ -29,7 +29,7 @@ extern int _test_and_set (int *p, int v) __THROW;
#ifdef __USE_EXTERN_INLINES
# ifndef _EXTERN_INLINE
-# define _EXTERN_INLINE extern __inline
+# define _EXTERN_INLINE __extern_inline
# endif
_EXTERN_INLINE int