summaryrefslogtreecommitdiffstats
path: root/libcxx/include
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2012-12-31 06:09:54 +0000
committerChandler Carruth <chandlerc@gmail.com>2012-12-31 06:09:54 +0000
commite70a813b599a0a93d2e4aa8030c169c2980ca96c (patch)
tree4c8b35de6988c31485f2941759c498fe5eefcd1b /libcxx/include
parent3036ab26e311e751bfb97fe5647e0bec7a5f7c01 (diff)
downloadbcm5719-llvm-e70a813b599a0a93d2e4aa8030c169c2980ca96c.tar.gz
bcm5719-llvm-e70a813b599a0a93d2e4aa8030c169c2980ca96c.zip
Don't mark variadic functions as always inline -- they cannot in fact be
inlined. Patch by Saleem Abdulrasool, reviewed by Michael Spencer and Richard Smith. llvm-svn: 171276
Diffstat (limited to 'libcxx/include')
-rw-r--r--libcxx/include/locale8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/locale b/libcxx/include/locale
index 722605cd2f7..cf213bb817b 100644
--- a/libcxx/include/locale
+++ b/libcxx/include/locale
@@ -354,7 +354,7 @@ size_t __mbsrtowcs_l(wchar_t *__dest, const char **__src, size_t __len,
#endif
}
-_LIBCPP_ALWAYS_INLINE inline
+inline
int __sprintf_l(char *__s, locale_t __l, const char *__format, ...) {
va_list __va;
va_start(__va, __format);
@@ -368,7 +368,7 @@ int __sprintf_l(char *__s, locale_t __l, const char *__format, ...) {
return __res;
}
-_LIBCPP_ALWAYS_INLINE inline
+inline
int __snprintf_l(char *__s, size_t __n, locale_t __l, const char *__format, ...) {
va_list __va;
va_start(__va, __format);
@@ -382,7 +382,7 @@ int __snprintf_l(char *__s, size_t __n, locale_t __l, const char *__format, ...)
return __res;
}
-_LIBCPP_ALWAYS_INLINE inline
+inline
int __asprintf_l(char **__s, locale_t __l, const char *__format, ...) {
va_list __va;
va_start(__va, __format);
@@ -396,7 +396,7 @@ int __asprintf_l(char **__s, locale_t __l, const char *__format, ...) {
return __res;
}
-_LIBCPP_ALWAYS_INLINE inline
+inline
int __sscanf_l(const char *__s, locale_t __l, const char *__format, ...) {
va_list __va;
va_start(__va, __format);
OpenPOWER on IntegriCloud