- (djm) [defines.h sshbuf.c] Move __predict_true|false to defines.h and

   conditionalise to avoid duplicate definition.

1 files changed, 0 insertions, 10 deletions

diff --git a/sshbuf.c b/sshbuf.c
index 5df7c9f46..78f5340a1 100644
--- a/sshbuf.c
+++ b/sshbuf.c
@@ -28,16 +28,6 @@
 #include "ssherr.h"
 #include "sshbuf.h"
 
-/* XXX move to defines.h? */
-#if defined(__GNUC__) && \
-    ((__GNUC__ > (2)) || (__GNUC__ == (2) && __GNUC_MINOR__ >= (96)))
-#define __predict_true(exp)     __builtin_expect(((exp) != 0), 1)
-#define __predict_false(exp)    __builtin_expect(((exp) != 0), 0)
-#else
-#define __predict_true(exp)     ((exp) != 0)
-#define __predict_false(exp)    ((exp) != 0)
-#endif
-
 static inline int
 sshbuf_check_sanity(const struct sshbuf *buf)
 {