[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Tue Jun 16 11:11:19 UTC 2015
The branch master has been updated
via b4f0d1a4a89b964dba80036a6348ca0a1913c526 (commit)
via 30cf91784bfde82622f79d87d17d20ce73329532 (commit)
from 3b061a00e39d2e4ad524ff01cbdc0c53fe8171ee (commit)
- Log -----------------------------------------------------------------
commit b4f0d1a4a89b964dba80036a6348ca0a1913c526
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Jun 15 09:59:25 2015 +0200
Make preprocessor error into real preprocessor error
Reviewed-by: Kurt Roeckx <kurt at openssl.org>
commit 30cf91784bfde82622f79d87d17d20ce73329532
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Jun 13 13:13:55 2015 +0200
Remove one extraneous parenthesis
Reviewed-by: Kurt Roeckx <kurt at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/opensslconf.h.in | 2 +-
include/openssl/bio.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
index 504d93d..4429c91 100644
--- a/crypto/opensslconf.h.in
+++ b/crypto/opensslconf.h.in
@@ -118,7 +118,7 @@
#endif
#if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#endif
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index e224dd9..7fe88ec 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -276,7 +276,7 @@ void BIO_clear_flags(BIO *b, int flags);
* BIO_CB_RETURN flag indicates if it is after the call
*/
# define BIO_CB_RETURN 0x80
-# define BIO_CB_return(a) ((a)|BIO_CB_RETURN))
+# define BIO_CB_return(a) ((a)|BIO_CB_RETURN)
# define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN))
# define BIO_cb_post(a) ((a)&BIO_CB_RETURN)
More information about the openssl-commits
mailing list