unbreak build this needed to be an and..

ok jsing@
author: beck <> 2014-07-13 14:13:27 +0000
committer: beck <> 2014-07-13 14:13:27 +0000
commit: 93015607b39f25ca4df49ca2c6da58ae67994035 (patch)
tree: 417be60aee6e72ff09bba08ed5a06dc6c2447ef7
parent: 29dfc21d062d6f2453c4a90cddbf08f7f7e4e1fe (diff)
download: openbsd-93015607b39f25ca4df49ca2c6da58ae67994035.tar.gz
openbsd-93015607b39f25ca4df49ca2c6da58ae67994035.tar.bz2
openbsd-93015607b39f25ca4df49ca2c6da58ae67994035.zip
8 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index 59f916f085..dc9c9b9e14 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/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/src/lib/libcrypto/buffer/buffer.h b/src/lib/libcrypto/buffer/buffer.h
index 00759cf857..def1943d31 100644
--- a/src/lib/libcrypto/buffer/buffer.h
+++ b/src/lib/libcrypto/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/src/lib/libcrypto/md5/md5.h b/src/lib/libcrypto/md5/md5.h
index 6f50e7f0dd..89e4b7f5ee 100644
--- a/src/lib/libcrypto/md5/md5.h
+++ b/src/lib/libcrypto/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/src/lib/libcrypto/sha/sha.h b/src/lib/libcrypto/sha/sha.h
index d227ae458a..e4fdae9788 100644
--- a/src/lib/libcrypto/sha/sha.h
+++ b/src/lib/libcrypto/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
diff --git a/src/lib/libssl/src/crypto/bio/bio.h b/src/lib/libssl/src/crypto/bio/bio.h
index 59f916f085..dc9c9b9e14 100644
--- a/src/lib/libssl/src/crypto/bio/bio.h
+++ b/src/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/src/lib/libssl/src/crypto/buffer/buffer.h b/src/lib/libssl/src/crypto/buffer/buffer.h
index 00759cf857..def1943d31 100644
--- a/src/lib/libssl/src/crypto/buffer/buffer.h
+++ b/src/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/src/lib/libssl/src/crypto/md5/md5.h b/src/lib/libssl/src/crypto/md5/md5.h
index 6f50e7f0dd..89e4b7f5ee 100644
--- a/src/lib/libssl/src/crypto/md5/md5.h
+++ b/src/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/src/lib/libssl/src/crypto/sha/sha.h b/src/lib/libssl/src/crypto/sha/sha.h
index d227ae458a..e4fdae9788 100644
--- a/src/lib/libssl/src/crypto/sha/sha.h
+++ b/src/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
author	beck <>	2014-07-13 14:13:27 +0000
committer	beck <>	2014-07-13 14:13:27 +0000
commit	93015607b39f25ca4df49ca2c6da58ae67994035 (patch)
tree	417be60aee6e72ff09bba08ed5a06dc6c2447ef7
parent	29dfc21d062d6f2453c4a90cddbf08f7f7e4e1fe (diff)
download	openbsd-93015607b39f25ca4df49ca2c6da58ae67994035.tar.gz openbsd-93015607b39f25ca4df49ca2c6da58ae67994035.tar.bz2 openbsd-93015607b39f25ca4df49ca2c6da58ae67994035.zip

diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h index 59f916f085..dc9c9b9e14 100644 --- a/src/lib/libcrypto/bio/bio.h +++ b/src/lib/libcrypto/bio/bio.h
@@ -1,4 +1,4 @@
1	/* $OpenBSD: bio.h,v 1.25 2014/07/13 10:27:22 beck Exp $ */	1	/* $OpenBSD: bio.h,v 1.26 2014/07/13 14:13:27 beck Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -58,7 +58,7 @@
58		58
59	#ifndef HEADER_BIO_H	59	#ifndef HEADER_BIO_H
60	#define HEADER_BIO_H	60	#define HEADER_BIO_H
61	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) \|\| !defined(__OpenBSD__)	61	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
62	#define __bounded__(x, y, z)	62	#define __bounded__(x, y, z)
63	#endif	63	#endif
64	#include <openssl/opensslconf.h>	64	#include <openssl/opensslconf.h>


diff --git a/src/lib/libcrypto/buffer/buffer.h b/src/lib/libcrypto/buffer/buffer.h index 00759cf857..def1943d31 100644 --- a/src/lib/libcrypto/buffer/buffer.h +++ b/src/lib/libcrypto/buffer/buffer.h
@@ -1,4 +1,4 @@
1	/* $OpenBSD: buffer.h,v 1.12 2014/07/13 10:27:22 beck Exp $ */	1	/* $OpenBSD: buffer.h,v 1.13 2014/07/13 14:13:27 beck Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -58,7 +58,7 @@
58		58
59	#ifndef HEADER_BUFFER_H	59	#ifndef HEADER_BUFFER_H
60	#define HEADER_BUFFER_H	60	#define HEADER_BUFFER_H
61	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) \|\| !defined(__OpenBSD__)	61	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
62	#define __bounded__(x, y, z)	62	#define __bounded__(x, y, z)
63	#endif	63	#endif
64		64


diff --git a/src/lib/libcrypto/md5/md5.h b/src/lib/libcrypto/md5/md5.h index 6f50e7f0dd..89e4b7f5ee 100644 --- a/src/lib/libcrypto/md5/md5.h +++ b/src/lib/libcrypto/md5/md5.h
@@ -1,4 +1,4 @@
1	/* $OpenBSD: md5.h,v 1.18 2014/07/13 10:27:22 beck Exp $ */	1	/* $OpenBSD: md5.h,v 1.19 2014/07/13 14:13:27 beck Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -60,7 +60,7 @@
60		60
61	#ifndef HEADER_MD5_H	61	#ifndef HEADER_MD5_H
62	#define HEADER_MD5_H	62	#define HEADER_MD5_H
63	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) \|\| !defined(__OpenBSD__)	63	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
64	#define __bounded__(x, y, z)	64	#define __bounded__(x, y, z)
65	#endif	65	#endif
66		66


diff --git a/src/lib/libcrypto/sha/sha.h b/src/lib/libcrypto/sha/sha.h index d227ae458a..e4fdae9788 100644 --- a/src/lib/libcrypto/sha/sha.h +++ b/src/lib/libcrypto/sha/sha.h
@@ -1,4 +1,4 @@
1	/* $OpenBSD: sha.h,v 1.18 2014/07/13 10:27:22 beck Exp $ */	1	/* $OpenBSD: sha.h,v 1.19 2014/07/13 14:13:27 beck Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -60,7 +60,7 @@
60		60
61	#ifndef HEADER_SHA_H	61	#ifndef HEADER_SHA_H
62	#define HEADER_SHA_H	62	#define HEADER_SHA_H
63	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) \|\| !defined(__OpenBSD__)	63	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
64	#define __bounded__(x, y, z)	64	#define __bounded__(x, y, z)
65	#endif	65	#endif
66		66


diff --git a/src/lib/libssl/src/crypto/bio/bio.h b/src/lib/libssl/src/crypto/bio/bio.h index 59f916f085..dc9c9b9e14 100644 --- a/src/lib/libssl/src/crypto/bio/bio.h +++ b/src/lib/libssl/src/crypto/bio/bio.h
@@ -1,4 +1,4 @@
1	/* $OpenBSD: bio.h,v 1.25 2014/07/13 10:27:22 beck Exp $ */	1	/* $OpenBSD: bio.h,v 1.26 2014/07/13 14:13:27 beck Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -58,7 +58,7 @@
58		58
59	#ifndef HEADER_BIO_H	59	#ifndef HEADER_BIO_H
60	#define HEADER_BIO_H	60	#define HEADER_BIO_H
61	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) \|\| !defined(__OpenBSD__)	61	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
62	#define __bounded__(x, y, z)	62	#define __bounded__(x, y, z)
63	#endif	63	#endif
64	#include <openssl/opensslconf.h>	64	#include <openssl/opensslconf.h>


diff --git a/src/lib/libssl/src/crypto/buffer/buffer.h b/src/lib/libssl/src/crypto/buffer/buffer.h index 00759cf857..def1943d31 100644 --- a/src/lib/libssl/src/crypto/buffer/buffer.h +++ b/src/lib/libssl/src/crypto/buffer/buffer.h
@@ -1,4 +1,4 @@
1	/* $OpenBSD: buffer.h,v 1.12 2014/07/13 10:27:22 beck Exp $ */	1	/* $OpenBSD: buffer.h,v 1.13 2014/07/13 14:13:27 beck Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -58,7 +58,7 @@
58		58
59	#ifndef HEADER_BUFFER_H	59	#ifndef HEADER_BUFFER_H
60	#define HEADER_BUFFER_H	60	#define HEADER_BUFFER_H
61	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) \|\| !defined(__OpenBSD__)	61	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
62	#define __bounded__(x, y, z)	62	#define __bounded__(x, y, z)
63	#endif	63	#endif
64		64


diff --git a/src/lib/libssl/src/crypto/md5/md5.h b/src/lib/libssl/src/crypto/md5/md5.h index 6f50e7f0dd..89e4b7f5ee 100644 --- a/src/lib/libssl/src/crypto/md5/md5.h +++ b/src/lib/libssl/src/crypto/md5/md5.h
@@ -1,4 +1,4 @@
1	/* $OpenBSD: md5.h,v 1.18 2014/07/13 10:27:22 beck Exp $ */	1	/* $OpenBSD: md5.h,v 1.19 2014/07/13 14:13:27 beck Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -60,7 +60,7 @@
60		60
61	#ifndef HEADER_MD5_H	61	#ifndef HEADER_MD5_H
62	#define HEADER_MD5_H	62	#define HEADER_MD5_H
63	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) \|\| !defined(__OpenBSD__)	63	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
64	#define __bounded__(x, y, z)	64	#define __bounded__(x, y, z)
65	#endif	65	#endif
66		66


diff --git a/src/lib/libssl/src/crypto/sha/sha.h b/src/lib/libssl/src/crypto/sha/sha.h index d227ae458a..e4fdae9788 100644 --- a/src/lib/libssl/src/crypto/sha/sha.h +++ b/src/lib/libssl/src/crypto/sha/sha.h
@@ -1,4 +1,4 @@
1	/* $OpenBSD: sha.h,v 1.18 2014/07/13 10:27:22 beck Exp $ */	1	/* $OpenBSD: sha.h,v 1.19 2014/07/13 14:13:27 beck Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -60,7 +60,7 @@
60		60
61	#ifndef HEADER_SHA_H	61	#ifndef HEADER_SHA_H
62	#define HEADER_SHA_H	62	#define HEADER_SHA_H
63	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) \|\| !defined(__OpenBSD__)	63	#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
64	#define __bounded__(x, y, z)	64	#define __bounded__(x, y, z)
65	#endif	65	#endif
66		66