diff options
author | Lutz Jänicke <jaenicke@openssl.org> | 2002-07-10 07:01:54 +0000 |
---|---|---|
committer | Lutz Jänicke <jaenicke@openssl.org> | 2002-07-10 07:01:54 +0000 |
commit | 7b63c0fa8c309bed7848b5ca5810ae9e2f2fb3c1 (patch) | |
tree | b17353bbf0eb8e7e4452b1c5044d84b6c0bc4e11 /ssl/ssl_lib.c | |
parent | 063a8905bfd53f3cc12a01789efc23c0ea6af053 (diff) |
Reorder inclusion of header files:
des_old.h redefines crypt:
#define crypt(b,s)\
DES_crypt((b),(s))
This scheme leads to failure, if header files with the OS's true definition
of crypt() are processed _after_ des_old.h was processed. This is e.g. the
case on HP-UX with unistd.h.
As evp.h now again includes des.h (which includes des_old.h), this problem
only came up after this modification.
Solution: move header files (indirectly) including e_os.h before the header
files (indirectly) including evp.h.
Submitted by:
Reviewed by:
PR:
Diffstat (limited to 'ssl/ssl_lib.c')
-rw-r--r-- | ssl/ssl_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index df307a80c5..ab172aeaec 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -116,11 +116,11 @@ # include <assert.h> #endif #include <stdio.h> +#include "ssl_locl.h" +#include "kssl_lcl.h" #include <openssl/objects.h> #include <openssl/lhash.h> #include <openssl/x509v3.h> -#include "ssl_locl.h" -#include "kssl_lcl.h" const char *SSL_version_str=OPENSSL_VERSION_TEXT; |