From 23f269562b7537b2f6f5014e50a25e5dcc55a837 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 3 Sep 2014 05:33:25 +1000
Subject:  - (djm) [defines.h sshbuf.c] Move __predict_true|false to defines.h
 and    conditionalise to avoid duplicate definition.

---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 97eb0a8c2..128368da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20140903
+ - (djm) [defines.h sshbuf.c] Move __predict_true|false to defines.h and
+   conditionalise to avoid duplicate definition.
+
 20140830
  - (djm) [openbsd-compat/openssl-compat.h] add
    OPENSSL_[RD]SA_MAX_MODULUS_BITS defines for OpenSSL that lacks them
-- 
cgit v1.2.3