luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-29 02:50:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make g_strerror work with non-glibc POSIX systems

Browse Source 
We should only use GNU-specific strerror_r on glibc. On other systems,
we should use the XSI-compliant version.

https://bugzilla.gnome.org/show_bug.cgi?id=754601
This commit is contained in:
Ting-Wei Lan 2015-09-05 23:35:57 +08:00 committed by Colin Walters
parent e773acfe9a
commit ebf961a58d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glib/gstrfuncs.c
View File

@ -1258,14 +1258,19 @@ g_strerror (gint errnum)
gint saved_errno = errno;
GError *error = NULL;
/* Since we are building with _GNU_SOURCE, we get the
* GNU variant of strerror_r (with glibc).
*/
#ifdef G_OS_WIN32
strerror_s (buf, sizeof (buf), errnum);
msg = buf;
#else
/* If we're using glibc, since we are building with _GNU_SOURCE, we
* expect to get the GNU variant of strerror_r. However, use the
* provided check from man strerror_r(3) in case we ever stop using
* _GNU_SOURCE (admittedly unlikely).
*/
#elif (defined __GLIBC__) && !((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE)
msg = strerror_r (errnum, buf, sizeof (buf));
#else
strerror_r (errnum, buf, sizeof (buf));
msg = buf;
#endif
if (!g_get_charset (NULL))
{