diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2011-11-02 16:40:32 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2011-11-02 16:40:32 +0000 |
| commit | 164f4a6c8b67b241a002f401907fda180ed660c0 (patch) | |
| tree | de0ab4f8fb9e7ee2d65f75b8addc293d9d6a881a /gnu | |
| parent | e9e49a8d1c15fbb5dd3aa92b7108c0bc4ab19ede (diff) | |
Remove '#if !defined(OpenBSD)' wrappers around wcsftime() and iswblank().
From brad. ok kettenis espie
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/gcc/libstdc++-v3/config/locale/generic/time_members.cc | 4 | ||||
| -rw-r--r-- | gnu/gcc/libstdc++-v3/include/tr1/cwctype | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/gnu/gcc/libstdc++-v3/config/locale/generic/time_members.cc b/gnu/gcc/libstdc++-v3/config/locale/generic/time_members.cc index 3fd56ed1523..dbb12ae6848 100644 --- a/gnu/gcc/libstdc++-v3/config/locale/generic/time_members.cc +++ b/gnu/gcc/libstdc++-v3/config/locale/generic/time_members.cc @@ -128,16 +128,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { char* __old = strdup(setlocale(LC_ALL, NULL)); setlocale(LC_ALL, _M_name_timepunct); -#if !defined(__OpenBSD__) const size_t __len = wcsftime(__s, __maxlen, __format, __tm); -#endif setlocale(LC_ALL, __old); free(__old); -#if !defined(__OpenBSD__) // Make sure __s is null terminated. if (__len == 0) __s[0] = L'\0'; -#endif } template<> diff --git a/gnu/gcc/libstdc++-v3/include/tr1/cwctype b/gnu/gcc/libstdc++-v3/include/tr1/cwctype index 9920a78ae2c..7cc7a36c68b 100644 --- a/gnu/gcc/libstdc++-v3/include/tr1/cwctype +++ b/gnu/gcc/libstdc++-v3/include/tr1/cwctype @@ -45,7 +45,7 @@ namespace std { _GLIBCXX_BEGIN_NAMESPACE(tr1) -#if defined(_GLIBCXX_HAVE_ISWBLANK) && !defined(__OpenBSD__) +#if _GLIBCXX_HAVE_ISWBLANK using std::iswblank; #endif |