From 686c7d9ee6f44b2be4128d7860b6b37adaeba733 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 15 May 2014 14:37:03 +1000
Subject:    - djm@cvs.openbsd.org 2014/05/02 03:27:54      [chacha.h
 cipher-chachapoly.h digest.h hmac.h kex.h kexc25519.c]      [misc.h
 poly1305.h ssh-pkcs11.c defines.h]      revert __bounded change; it causes
 way more problems for portable than      it solves; pointed out by dtucker@

---
 defines.h | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'defines.h')

diff --git a/defines.h b/defines.h
index 928bd9b01..9e383020b 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.178 2014/04/30 16:24:35 dtucker Exp $ */
+/* $Id: defines.h,v 1.179 2014/05/15 04:37:04 djm Exp $ */
 
 
 /* Constants */
@@ -826,22 +826,4 @@ struct winsize {
 # define arc4random_stir()
 #endif
 
-/* Macro to test if we're using a specific version of gcc or later. */
-#if defined(__GNUC__) && !defined(__GNUC_PREREQ__)
-#define __GNUC_PREREQ__(ma, mi) \
-	((__GNUC__ > (ma)) || (__GNUC__ == (ma) && __GNUC_MINOR__ >= (mi)))
-#else
-#define __GNUC_PREREQ__(ma, mi) 0
-#endif
-
-/* __bounded macro */
-#ifndef __bounded
-# if defined(__GNUC__) && __GNUC_PREREQ__(3,3) && !defined(__clang__)
-#  define __bounded(args)	__attribute__ ((__bounded__ args ))
-# else
-#  define __bounded(args)	/* delete */
-# endif /* __GNUC_PREREQ__(3,3) && !defined(__clang__) */
-#endif
-
-
 #endif /* _DEFINES_H */
-- 
cgit v1.2.3