Module Name: src
Committed By: martin
Date: Sat Mar 21 13:35:48 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: opensslconf.h
Log Message:
In a "native" build, this file is postprocessed by a perl script and some
lines are changed into either #define SOMETHING or #undef SOMETHING,
but in our in-tree build it is installed verbatim - so comment out all
#undef parts, to allow our makefile fragments to freely -DSOMETHING
and not have it silently canceld here.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h
diff -u src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h:1.7 src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h:1.8
--- src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h:1.7 Fri Oct 17 16:34:25 2014
+++ src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h Sat Mar 21 13:35:48 2015
@@ -154,7 +154,7 @@ extern "C" {
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H
-#undef BN_LLONG
+/* #undef BN_LLONG */
/* Should we define BN_DIV2W here? */
@@ -174,7 +174,7 @@ extern "C" {
#define CONFIG_HEADER_RC4_LOCL_H
/* if this is defined data[i] is used instead of *data, this is a %20
* speedup on x86 */
-#undef RC4_INDEX
+/* #undef RC4_INDEX */
#endif
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
@@ -188,18 +188,18 @@ extern "C" {
/* the following is tweaked from a config script, that is why it is a
* protected undef/define */
#ifndef DES_PTR
-#undef DES_PTR
+/* #undef DES_PTR */
#endif
/* This helps C compiler generate the correct code for multiple functional
* units. It reduces register dependancies at the expense of 2 more
* registers */
#ifndef DES_RISC1
-#undef DES_RISC1
+/* #undef DES_RISC1 */
#endif
#ifndef DES_RISC2
-#undef DES_RISC2
+/* #undef DES_RISC2 */
#endif
#if defined(DES_RISC1) && defined(DES_RISC2)
@@ -209,7 +209,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND D
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
* Very mucy CPU dependant */
#ifndef DES_UNROLL
-#undef DES_UNROLL
+/* #undef DES_UNROLL */
#endif
/* These default values were supplied by
