diff options
Diffstat (limited to 'crypto/openssl/crypto/opensslconf.h')
| -rw-r--r-- | crypto/openssl/crypto/opensslconf.h | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/crypto/openssl/crypto/opensslconf.h b/crypto/openssl/crypto/opensslconf.h index 2c6ddae..492041b 100644 --- a/crypto/openssl/crypto/opensslconf.h +++ b/crypto/openssl/crypto/opensslconf.h @@ -2,12 +2,22 @@ /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ /* OpenSSL was configured with the following options: */ -#ifdef OPENSSL_ALGORITHM_DEFINES - /* no ciphers excluded */ -#endif -#ifdef OPENSSL_THREAD_DEFINES +#ifndef OPENSSL_DOING_MAKEDEPEND + +#ifndef OPENSSL_NO_KRB5 +# define OPENSSL_NO_KRB5 #endif -#ifdef OPENSSL_OTHER_DEFINES + +#endif /* OPENSSL_DOING_MAKEDEPEND */ + +/* The OPENSSL_NO_* macros are also defined as NO_* if the application + asks for it. This is a transient feature that is provided for those + who haven't had the time to do the appropriate changes in their + applications. */ +#ifdef OPENSSL_ALGORITHM_DEFINES +# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) +# define NO_KRB5 +# endif #endif /* crypto/opensslconf.h.in */ @@ -21,8 +31,11 @@ #endif #endif +#undef OPENSSL_UNISTD #define OPENSSL_UNISTD <unistd.h> +#undef OPENSSL_EXPORT_VAR_AS_FUNCTION + #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) #define IDEA_INT unsigned int #endif @@ -56,7 +69,7 @@ #endif #endif -#if defined(HEADER_DES_H) && !defined(DES_LONG) +#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #ifndef DES_LONG @@ -156,7 +169,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! # define DES_PTR # define DES_RISC2 # define DES_UNROLL -#elif defined( i386 ) /* x86 boxes, should be gcc */ +#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ # define DES_PTR # define DES_RISC1 # define DES_UNROLL |
