OSX build fixes, again...

This commit is contained in:
tamasmeszaros 2018-05-22 15:13:07 +02:00
parent 73b861287c
commit 9c2d9b2ba3
3 changed files with 24 additions and 18 deletions

View file

@ -96,18 +96,18 @@ namespace png
#define ERRBUF_SIZE 512
char buf[ERRBUF_SIZE] = { 0 };
#ifdef HAVE_STRERROR_S
//#ifdef HAVE_STRERROR_S
strerror_s(buf, ERRBUF_SIZE, errnum);
return std::string(buf);
#else
#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE
strerror_r(errnum, buf, ERRBUF_SIZE);
return std::string(buf);
#else
/* GNU variant can return a pointer to static buffer instead of buf */
return std::string(strerror_r(errnum, buf, ERRBUF_SIZE));
#endif
#endif
//#else
//#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE
// strerror_r(errnum, buf, ERRBUF_SIZE);
// return std::string(buf);
//#else
// /* GNU variant can return a pointer to static buffer instead of buf */
// return std::string(strerror_r(errnum, buf, ERRBUF_SIZE));
//#endif
//#endif
#undef ERRBUF_SIZE
}