2003-06-12  Ulrich Drepper  <drepper@redhat.com>

	* wcsmbs/wchar.h: Define wint_t in std namespace, too [PR libc/5034].
This commit is contained in:
Ulrich Drepper 2003-06-13 05:19:10 +00:00
parent b54aa55d36
commit e6d329961f
3 changed files with 15 additions and 7 deletions

View File

@ -1,3 +1,7 @@
2003-06-12 Ulrich Drepper <drepper@redhat.com>
* wcsmbs/wchar.h: Define wint_t in std namespace, too [PR libc/5034].
2003-05-29 Jim Meyering <jim@meyering.net> 2003-05-29 Jim Meyering <jim@meyering.net>
* time/strftime.c (my_strftime) [!defined _NL_CURRENT * time/strftime.c (my_strftime) [!defined _NL_CURRENT

View File

@ -248,13 +248,12 @@ done:
POSTPROCESS; POSTPROCESS;
#endif #endif
return (status == NSS_STATUS_SUCCESS ? 0 return (status == NSS_STATUS_SUCCESS ? 0
: (status != NSS_STATUS_TRYAGAIN
#ifdef NEED_H_ERRNO #ifdef NEED_H_ERRNO
/* These functions only set errno if h_errno is /* These functions only set errno if h_errno is NETDB_INTERNAL. */
NETDB_INTERNAL. */ : status == NSS_STATUS_TRYAGAIN && *h_errnop != NETDB_INTERNAL
&& *h_errnop == NETDB_INTERNAL ? EAGAIN
#endif #endif
? errno : EAGAIN)); : errno);
} }

View File

@ -59,8 +59,13 @@
# define _WINT_T # define _WINT_T
typedef unsigned int wint_t; typedef unsigned int wint_t;
#else #else
# ifdef __USE_GNU /* Work around problems with the <stddef.h> file which doesn't put
__USING_NAMESPACE_STD(wint_t) wint_t in the std namespace. */
# if defined __cplusplus && defined _GLIBCPP_USE_NAMESPACES \
&& defined __WINT_TYPE__
__BEGIN_NAMESPACE_STD
typedef __WINT_TYPE__ wint_t;
__END_NAMESPACE_STD
# endif # endif
#endif #endif