diff options
author | jsing <> | 2014-07-10 22:45:58 +0000 |
---|---|---|
committer | jsing <> | 2014-07-10 22:45:58 +0000 |
commit | c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5 (patch) | |
tree | 9101caa8789c6a2612e96fe7996efbe84f28f5a9 /src/lib/libcrypto/rand/rand.h | |
parent | 81b6b7632b2207a2dbd7b6d803912ee3779176aa (diff) | |
download | openbsd-c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5.tar.gz openbsd-c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5.tar.bz2 openbsd-c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5.zip |
Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.
This also includes some miscellaneous sorting/tidying of headers.
Diffstat (limited to 'src/lib/libcrypto/rand/rand.h')
-rw-r--r-- | src/lib/libcrypto/rand/rand.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/rand/rand.h b/src/lib/libcrypto/rand/rand.h index af3d111b13..6ed16b9c41 100644 --- a/src/lib/libcrypto/rand/rand.h +++ b/src/lib/libcrypto/rand/rand.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rand.h,v 1.20 2014/06/12 15:49:30 deraadt Exp $ */ | 1 | /* $OpenBSD: rand.h,v 1.21 2014/07/10 22:45:57 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 | * |
@@ -56,11 +56,11 @@ | |||
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | 58 | ||
59 | #include <stdlib.h> | ||
60 | |||
59 | #ifndef HEADER_RAND_H | 61 | #ifndef HEADER_RAND_H |
60 | #define HEADER_RAND_H | 62 | #define HEADER_RAND_H |
61 | 63 | ||
62 | #include <stdlib.h> | ||
63 | |||
64 | #include <openssl/opensslconf.h> | 64 | #include <openssl/opensslconf.h> |
65 | 65 | ||
66 | #include <openssl/ossl_typ.h> | 66 | #include <openssl/ossl_typ.h> |