diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-02-23 14:52:23 +0100 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-02-24 09:21:59 +0100 |
| commit | 01b76c2c5d4d786cfcb3cc048d9c0c47229a0aa0 (patch) | |
| tree | c08be97dfeed4dd7bf71c109485b6f3d46180647 /crypto | |
| parent | 75c13e7830653eee4b61dd96ceea7c446c381316 (diff) | |
| download | openssl-01b76c2c5d4d786cfcb3cc048d9c0c47229a0aa0.tar.gz | |
Add -Wundef to --strict-warnings options.
Avoid a -Wundef warning in refcount.h
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/2712)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/o_str.c | 3 | ||||
| -rw-r--r-- | crypto/x509/x509_att.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_ext.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_v3.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509name.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x_all.c | 2 |
6 files changed, 7 insertions, 6 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 diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c index a91f9829b5..3876a83323 100644 --- a/crypto/x509/x509_att.c +++ b/crypto/x509/x509_att.c @@ -8,8 +8,8 @@ */ #include <stdio.h> -#include <openssl/stack.h> #include "internal/cryptlib.h" +#include <openssl/stack.h> #include <openssl/asn1.h> #include <openssl/objects.h> #include <openssl/evp.h> diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c index 3bbb0a6b6c..3c59079852 100644 --- a/crypto/x509/x509_ext.c +++ b/crypto/x509/x509_ext.c @@ -8,8 +8,8 @@ */ #include <stdio.h> -#include <openssl/stack.h> #include "internal/cryptlib.h" +#include <openssl/stack.h> #include <openssl/asn1.h> #include <openssl/objects.h> #include <openssl/evp.h> diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c index ad126efeba..213e762f98 100644 --- a/crypto/x509/x509_v3.c +++ b/crypto/x509/x509_v3.c @@ -8,8 +8,8 @@ */ #include <stdio.h> -#include <openssl/stack.h> #include "internal/cryptlib.h" +#include <openssl/stack.h> #include <openssl/asn1.h> #include <openssl/objects.h> #include <openssl/evp.h> diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c index ab53794741..2935b17af9 100644 --- a/crypto/x509/x509name.c +++ b/crypto/x509/x509name.c @@ -8,8 +8,8 @@ */ #include <stdio.h> -#include <openssl/stack.h> #include "internal/cryptlib.h" +#include <openssl/stack.h> #include <openssl/asn1.h> #include <openssl/objects.h> #include <openssl/evp.h> diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c index 124dd2d2f8..42bd161185 100644 --- a/crypto/x509/x_all.c +++ b/crypto/x509/x_all.c @@ -8,8 +8,8 @@ */ #include <stdio.h> -#include <openssl/stack.h> #include "internal/cryptlib.h" +#include <openssl/stack.h> #include <openssl/buffer.h> #include <openssl/asn1.h> #include <openssl/evp.h> |