diff options
| author | jsing <> | 2014-07-11 09:25:24 +0000 |
|---|---|---|
| committer | jsing <> | 2014-07-11 09:25:24 +0000 |
| commit | f76cfdba3247a4d469073bdcf9a5d4d05550b260 (patch) | |
| tree | 8d8b66e82f960380473540c4a5c23ea798e6396f /src | |
| parent | 0ca5011d0600da1f218404c4541317bad356f8f1 (diff) | |
| download | openbsd-f76cfdba3247a4d469073bdcf9a5d4d05550b260.tar.gz openbsd-f76cfdba3247a4d469073bdcf9a5d4d05550b260.tar.bz2 openbsd-f76cfdba3247a4d469073bdcf9a5d4d05550b260.zip | |
Revert change that snuck into previous commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/err/err.h | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/err/err.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h index 2bd6f0e8aa..ced340ea80 100644 --- a/src/lib/libcrypto/err/err.h +++ b/src/lib/libcrypto/err/err.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: err.h,v 1.20 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: err.h,v 1.21 2014/07/11 09:25:24 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -114,10 +114,8 @@ | |||
| 114 | 114 | ||
| 115 | #include <openssl/opensslconf.h> | 115 | #include <openssl/opensslconf.h> |
| 116 | 116 | ||
| 117 | #ifndef LIBRESSL_INTERNAL | ||
| 118 | #include <stdio.h> | 117 | #include <stdio.h> |
| 119 | #include <stdlib.h> | 118 | #include <stdlib.h> |
| 120 | #endif | ||
| 121 | 119 | ||
| 122 | #include <openssl/ossl_typ.h> | 120 | #include <openssl/ossl_typ.h> |
| 123 | #ifndef OPENSSL_NO_BIO | 121 | #ifndef OPENSSL_NO_BIO |
diff --git a/src/lib/libssl/src/crypto/err/err.h b/src/lib/libssl/src/crypto/err/err.h index 2bd6f0e8aa..ced340ea80 100644 --- a/src/lib/libssl/src/crypto/err/err.h +++ b/src/lib/libssl/src/crypto/err/err.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: err.h,v 1.20 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: err.h,v 1.21 2014/07/11 09:25:24 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -114,10 +114,8 @@ | |||
| 114 | 114 | ||
| 115 | #include <openssl/opensslconf.h> | 115 | #include <openssl/opensslconf.h> |
| 116 | 116 | ||
| 117 | #ifndef LIBRESSL_INTERNAL | ||
| 118 | #include <stdio.h> | 117 | #include <stdio.h> |
| 119 | #include <stdlib.h> | 118 | #include <stdlib.h> |
| 120 | #endif | ||
| 121 | 119 | ||
| 122 | #include <openssl/ossl_typ.h> | 120 | #include <openssl/ossl_typ.h> |
| 123 | #ifndef OPENSSL_NO_BIO | 121 | #ifndef OPENSSL_NO_BIO |