summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux/common/bits
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/common/bits
parent91b2dfd68f5aecc290a449905aa7456f27f10326 (diff)
parentc6e8f34a358f846aa15cb9f53251da3d6668abd1 (diff)
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'libc/sysdeps/linux/common/bits')
-rw-r--r--libc/sysdeps/linux/common/bits/mathinline.h2
-rw-r--r--libc/sysdeps/linux/common/bits/socket.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/common/bits/mathinline.h b/libc/sysdeps/linux/common/bits/mathinline.h
index 5498af6b6..02ec21b43 100644
--- a/libc/sysdeps/linux/common/bits/mathinline.h
+++ b/libc/sysdeps/linux/common/bits/mathinline.h
@@ -1,6 +1,6 @@
/* This file should provide inline versions of math functions.
- Surround GCC-specific parts with #ifdef __GNUC__, and use `extern __inline'.
+ Surround GCC-specific parts with #ifdef __GNUC__, and use `__extern_inline'.
This file should define __MATH_INLINES if functions are actually defined as
inlines. */
diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h
index d9a09feee..4ea13111a 100644
--- a/libc/sysdeps/linux/common/bits/socket.h
+++ b/libc/sysdeps/linux/common/bits/socket.h
@@ -301,7 +301,7 @@ __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
return (struct cmsghdr *) 0;
return __cmsg;
}
-#endif /* Use `extern inline'. */
+#endif /* Use `__extern_inline'. */
/* Socket level message types. This must match the definitions in
<linux/socket.h>. */