--- NetworkManager-1.18.1/shared/nm-glib-aux/nm-errno.c.old	2019-04-19 09:31:51.000000000 +0000
+++ NetworkManager-1.18.1/shared/nm-glib-aux/nm-errno.c	2019-05-10 06:01:00.812741059 +0000
@@ -106,7 +106,6 @@
 	nm_assert (buf);
 	nm_assert (buf_size > 0);
 
-#if (_POSIX_C_SOURCE >= 200112L) && !  _GNU_SOURCE
 	/* XSI-compliant */
 	{
 		int errno_saved = errno;
@@ -117,10 +116,6 @@
 		}
 		buf2 = buf;
 	}
-#else
-	/* GNU-specific */
-	buf2 = strerror_r (errsv, buf, buf_size);
-#endif
 
 	/* like g_strerror(), ensure that the error message is UTF-8. */
 	if (   !g_get_charset (NULL)