Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move the NetBSD version of:

Browse Source 
__convert_from_v(const __c_locale& __cloc, char* __out,
		    const int __size __attribute__ ((__unused__)),
		    const char* __fmt, ...)

from the .h file into the .cc file.

NetBSD version relies upon vasprintf_l() being defined and compile
contexts such as _XOPEN_SOURCE=600 or _POSIX_C_SOURCE < 200809 may
not provide the definition of it, cause compile time issues for
3rdparty applications in c++locale.h.  This ensure that all the
required definitions are present when this code is compiled.
This commit is contained in:
mrg 2021-04-24 21:17:40 +00:00
parent 10d97f11ed
commit 0973f141b9
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.cc vendored
View File

@ -28,6 +28,8 @@
// Written by Benjamin Kosnik <bkoz@redhat.com>
// Modified for DragonFly by John Marino <gnugcc@marino.st>
// Modified for NetBSD by Christos Zoulas <christos@zoulas.com> and
// matthew green <mrg@eterna.com.au>
#include <cstdlib>
#include <locale>
@ -191,6 +193,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const char* const* const locale::_S_categories = __gnu_cxx::category_names;
#ifdef __NetBSD__
int
__convert_from_v(const __c_locale& __cloc, char* __out,
const int __size __attribute__ ((__unused__)),
const char* __fmt, ...)
{
__builtin_va_list __args;
__builtin_va_start(__args, __fmt);
const int __ret = vsnprintf_l(__out, __size, (struct _locale *)__cloc,
__fmt, __args);
__builtin_va_end(__args);
return __ret;
}
#endif
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace

22
external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h vendored
View File

@ -33,6 +33,8 @@
// Written by Benjamin Kosnik <bkoz@redhat.com>
// Modified for DragonFly by John Marino <gnugcc@marino.st>
// Modified for NetBSD by Christos Zoulas <christos@zoulas.com> and
// matthew green <mrg@eterna.com.au>
#ifndef _GLIBCXX_CXX_LOCALE_H
#define _GLIBCXX_CXX_LOCALE_H 1
@ -54,6 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef int* __c_locale;
#ifndef __NetBSD__
// Convert numeric value of type double and long double to string and
// return length of string. If vsnprintf is available use it, otherwise
// fall back to the unsafe vsprintf which, in general, can be dangerous
@ -63,30 +66,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const int __size __attribute__ ((__unused__)),
const char* __fmt, ...)
{
#ifndef __NetBSD__
__c_locale __old = (__c_locale)uselocale((locale_t)__cloc);
#endif
__builtin_va_list __args;
__builtin_va_start(__args, __fmt);
#ifndef __NetBSD__
#if _GLIBCXX_USE_C99_STDIO
const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
#else
const int __ret = __builtin_vsprintf(__out, __fmt, __args);
#endif
uselocale((locale_t)__old);
#else
const int __ret = vsnprintf_l(__out, __size, (locale_t)__cloc, __fmt,
__args);
#endif
__builtin_va_end(__args);
uselocale((locale_t)__old);
return __ret;
}
#else
// NetBSD backend requires vasprintf_l() which may not be visible in
// all complation environments (eg, _XOPEN_SOURCE=600) so the backend
// lives in the library code, instead of this header.
int
__convert_from_v(const __c_locale& __cloc, char* __out,
const int __size __attribute__ ((__unused__)),
const char* __fmt, ...);
#endif
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace