Call for testing: OpenSSH 6.7

[Damien Miller]

On Tue, 2 Sep 2014, Corinna Vinschen wrote:

> On Aug 18 11:23, Damien Miller wrote:
> > Hi,
> > 
> > OpenSSH 6.7 is almost ready for release, so we would appreciate testing
> > on as many platforms and systems as possible. This is a big release
> > containing a number of features, a lot of internal refactoring and some
> > potentially-incompatible changes.
> 
> Btw., I'm getting two new warnings during build:

This should fix it

Index: defines.h
===================================================================
RCS file: /var/cvs/openssh/defines.h,v
retrieving revision 1.182
diff -u -p -r1.182 defines.h
--- defines.h	16 Jun 2014 12:50:56 -0000	1.182
+++ defines.h	2 Sep 2014 19:27:06 -0000
@@ -830,4 +830,15 @@ struct winsize {
 # endif
 #endif
 
+#ifndef __predict_true
+# 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 /* gcc version */
+#endif /* __predict_true */
+
 #endif /* _DEFINES_H */
Index: sshbuf.c
===================================================================
RCS file: /var/cvs/openssh/sshbuf.c,v
retrieving revision 1.4
diff -u -p -r1.4 sshbuf.c
--- sshbuf.c	2 Jul 2014 05:29:22 -0000	1.4
+++ sshbuf.c	2 Sep 2014 19:27:06 -0000
@@ -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)
 {