diff options
author | Rich Salz <rsalz@openssl.org> | 2017-02-23 09:48:49 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2017-02-23 09:48:49 -0500 |
commit | 4c3376ec2747ebd69b3da68d2d18b155fac5c03f (patch) | |
tree | 4cf4453717d50777a7df7c21904d813bfd6b0987 /crypto/o_str.c | |
parent | 6db2b1490e5da1255f4158dc8c2d4a2dd87cbe7b (diff) |
Add -Wundef to strict-warnings
Avoid a -Wundef warning in o_str.c
Avoid a -Wundef warning in testutil.h
Include internal/cryptlib.h before openssl/stack.h
to avoid use of undefined symbol OPENSSL_API_COMPAT.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2709)
Diffstat (limited to 'crypto/o_str.c')
-rw-r--r-- | crypto/o_str.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/o_str.c b/crypto/o_str.c index beabec0ddc..d8516c27bb 100644 --- a/crypto/o_str.c +++ b/crypto/o_str.c @@ -227,7 +227,8 @@ int openssl_strerror_r(int errnum, char *buf, size_t buflen) return !strerror_s(buf, buflen, errnum); #elif defined(_GNU_SOURCE) return strerror_r(errnum, buf, buflen) != NULL; -#elif (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) +#elif (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || \ + (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600) /* * We can use "real" strerror_r. The OpenSSL version differs in that it * gives 1 on success and 0 on failure for consistency with other OpenSSL |