diff options
| author | Damien Miller <djm@mindrot.org> | 2014-09-02 21:33:25 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-09-02 21:33:25 +0200 |
| commit | 23f269562b7537b2f6f5014e50a25e5dcc55a837 (patch) | |
| tree | 86cae8862abbdb5c726a557aeacabd9f0eca3592 /sshbuf.c | |
| parent | - (djm) [Makefile.in] Make TEST_SHELL a variable; "good idea" tim@ (diff) | |
| download | openssh-23f269562b7537b2f6f5014e50a25e5dcc55a837.tar.xz openssh-23f269562b7537b2f6f5014e50a25e5dcc55a837.zip | |
- (djm) [defines.h sshbuf.c] Move __predict_true|false to defines.h and
conditionalise to avoid duplicate definition.
Diffstat (limited to 'sshbuf.c')
| -rw-r--r-- | sshbuf.c | 10 |
1 files changed, 0 insertions, 10 deletions
@@ -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) { |