diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | acconfig.h | 12 | ||||
-rw-r--r-- | cipher.c | 4 | ||||
-rw-r--r-- | configure.in | 3 |
4 files changed, 10 insertions, 11 deletions
@@ -2,6 +2,8 @@ | |||
2 | - Integrated patchs from Juergen Keil <jk@tools.de> | 2 | - Integrated patchs from Juergen Keil <jk@tools.de> |
3 | - Avoid void* pointer arithmatic | 3 | - Avoid void* pointer arithmatic |
4 | - Use LDFLAGS correctly | 4 | - Use LDFLAGS correctly |
5 | - Added better test for inline functions compiler support from | ||
6 | Darren_Hall@progressive.com | ||
5 | 7 | ||
6 | 19991214 | 8 | 19991214 |
7 | - OpenBSD CVS Changes | 9 | - OpenBSD CVS Changes |
diff --git a/acconfig.h b/acconfig.h index 324f45dbe..6be7bddb2 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -261,14 +261,8 @@ enum | |||
261 | # define __P(x) x | 261 | # define __P(x) x |
262 | #endif | 262 | #endif |
263 | 263 | ||
264 | #ifdef __GNUC__ | 264 | #if defined(__GNUC__) && (__GNUC__ < 2) |
265 | # if __GNUC__ < 2 | 265 | # define __attribute__(x) |
266 | # define INLINE inline | ||
267 | # define __attribute__(x) | ||
268 | # else | ||
269 | # define INLINE __inline__ | ||
270 | # endif /* __GNUC__ < 2 */ | ||
271 | #else | 266 | #else |
272 | # define __attribute__(x) | 267 | # define __attribute__(x) |
273 | # define INLINE | 268 | #endif /* defined(__GNUC__) && (__GNUC__ < 2) */ |
274 | #endif /* __GNUC__ */ | ||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$Id: cipher.c,v 1.10 1999/12/14 22:06:28 damien Exp $"); | 15 | RCSID("$Id: cipher.c,v 1.11 1999/12/14 22:34:31 damien Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "cipher.h" | 18 | #include "cipher.h" |
@@ -111,7 +111,7 @@ swap_bytes(const unsigned char *src, unsigned char *dst_, int n) | |||
111 | 111 | ||
112 | void (*cipher_attack_detected) (const char *fmt,...) = fatal; | 112 | void (*cipher_attack_detected) (const char *fmt,...) = fatal; |
113 | 113 | ||
114 | static INLINE void | 114 | static inline void |
115 | detect_cbc_attack(const unsigned char *src, | 115 | detect_cbc_attack(const unsigned char *src, |
116 | unsigned int len) | 116 | unsigned int len) |
117 | { | 117 | { |
diff --git a/configure.in b/configure.in index f77e46a09..19372e2d5 100644 --- a/configure.in +++ b/configure.in | |||
@@ -8,7 +8,10 @@ AC_PROG_CPP | |||
8 | AC_PROG_RANLIB | 8 | AC_PROG_RANLIB |
9 | AC_PROG_INSTALL | 9 | AC_PROG_INSTALL |
10 | AC_CHECK_PROG(AR, ar, ar) | 10 | AC_CHECK_PROG(AR, ar, ar) |
11 | |||
12 | dnl Checks for compiler characteristics | ||
11 | if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi | 13 | if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi |
14 | AC_C_INLINE | ||
12 | 15 | ||
13 | dnl Check for OpenSSL/SSLeay directories. | 16 | dnl Check for OpenSSL/SSLeay directories. |
14 | AC_MSG_CHECKING([for OpenSSL/SSLeay directory]) | 17 | AC_MSG_CHECKING([for OpenSSL/SSLeay directory]) |