diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2014-07-13 14:13:28 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2014-07-13 14:13:28 +0000 |
| commit | 92021b59639fb49f7d44c7dfb96f1a650a64b023 (patch) | |
| tree | 3079bb65d0ad7b1035e70a4c365ec9862eba6860 | |
| parent | 219bdc1346eb068ef0b0ad85306200dd78dd66bb (diff) | |
unbreak build this needed to be an and..
ok jsing@
| -rw-r--r-- | lib/libssl/src/crypto/bio/bio.h | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/buffer/buffer.h | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/md5/md5.h | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/sha/sha.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/libssl/src/crypto/bio/bio.h b/lib/libssl/src/crypto/bio/bio.h index 59f916f0855..dc9c9b9e14e 100644 --- a/lib/libssl/src/crypto/bio/bio.h +++ b/lib/libssl/src/crypto/bio/bio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bio.h,v 1.25 2014/07/13 10:27:22 beck Exp $ */ +/* $OpenBSD: bio.h,v 1.26 2014/07/13 14:13:27 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,7 +58,7 @@ #ifndef HEADER_BIO_H #define HEADER_BIO_H -#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__) +#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__) #define __bounded__(x, y, z) #endif #include <openssl/opensslconf.h> diff --git a/lib/libssl/src/crypto/buffer/buffer.h b/lib/libssl/src/crypto/buffer/buffer.h index 00759cf8570..def1943d319 100644 --- a/lib/libssl/src/crypto/buffer/buffer.h +++ b/lib/libssl/src/crypto/buffer/buffer.h @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer.h,v 1.12 2014/07/13 10:27:22 beck Exp $ */ +/* $OpenBSD: buffer.h,v 1.13 2014/07/13 14:13:27 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,7 +58,7 @@ #ifndef HEADER_BUFFER_H #define HEADER_BUFFER_H -#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__) +#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__) #define __bounded__(x, y, z) #endif diff --git a/lib/libssl/src/crypto/md5/md5.h b/lib/libssl/src/crypto/md5/md5.h index 6f50e7f0ddc..89e4b7f5ee4 100644 --- a/lib/libssl/src/crypto/md5/md5.h +++ b/lib/libssl/src/crypto/md5/md5.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md5.h,v 1.18 2014/07/13 10:27:22 beck Exp $ */ +/* $OpenBSD: md5.h,v 1.19 2014/07/13 14:13:27 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,7 +60,7 @@ #ifndef HEADER_MD5_H #define HEADER_MD5_H -#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__) +#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__) #define __bounded__(x, y, z) #endif diff --git a/lib/libssl/src/crypto/sha/sha.h b/lib/libssl/src/crypto/sha/sha.h index d227ae458a5..e4fdae97887 100644 --- a/lib/libssl/src/crypto/sha/sha.h +++ b/lib/libssl/src/crypto/sha/sha.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sha.h,v 1.18 2014/07/13 10:27:22 beck Exp $ */ +/* $OpenBSD: sha.h,v 1.19 2014/07/13 14:13:27 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,7 +60,7 @@ #ifndef HEADER_SHA_H #define HEADER_SHA_H -#if !defined(HAVE_ATTRIBUTE__BOUNDED__) || !defined(__OpenBSD__) +#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__) #define __bounded__(x, y, z) #endif |