summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-12-15 09:34:31 +1100
committerDamien Miller <djm@mindrot.org>1999-12-15 09:34:31 +1100
commit3b9d5e993ad50613fb990f1b70c0ce77793cba8c (patch)
tree3acf0ccdefe883caa9d8f303df8b0e79d21da699
parent84093e9d7407b64673d20b38a02bca432f970ba6 (diff)
- Added better test for inline functions compiler support from
Darren_Hall@progressive.com
-rw-r--r--ChangeLog2
-rw-r--r--acconfig.h12
-rw-r--r--cipher.c4
-rw-r--r--configure.in3
4 files changed, 10 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index f96ddd45..6346a320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
- Integrated patchs from Juergen Keil <jk@tools.de>
- Avoid void* pointer arithmatic
- Use LDFLAGS correctly
+ - Added better test for inline functions compiler support from
+ Darren_Hall@progressive.com
19991214
- OpenBSD CVS Changes
diff --git a/acconfig.h b/acconfig.h
index 324f45db..6be7bddb 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -261,14 +261,8 @@ enum
# define __P(x) x
#endif
-#ifdef __GNUC__
-# if __GNUC__ < 2
-# define INLINE inline
-# define __attribute__(x)
-# else
-# define INLINE __inline__
-# endif /* __GNUC__ < 2 */
+#if defined(__GNUC__) && (__GNUC__ < 2)
+# define __attribute__(x)
#else
# define __attribute__(x)
-# define INLINE
-#endif /* __GNUC__ */
+#endif /* defined(__GNUC__) && (__GNUC__ < 2) */
diff --git a/cipher.c b/cipher.c
index b06564d4..64c407e6 100644
--- a/cipher.c
+++ b/cipher.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$Id: cipher.c,v 1.10 1999/12/14 22:06:28 damien Exp $");
+RCSID("$Id: cipher.c,v 1.11 1999/12/14 22:34:31 damien Exp $");
#include "ssh.h"
#include "cipher.h"
@@ -111,7 +111,7 @@ swap_bytes(const unsigned char *src, unsigned char *dst_, int n)
void (*cipher_attack_detected) (const char *fmt,...) = fatal;
-static INLINE void
+static inline void
detect_cbc_attack(const unsigned char *src,
unsigned int len)
{
diff --git a/configure.in b/configure.in
index f77e46a0..19372e2d 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,10 @@ AC_PROG_CPP
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_CHECK_PROG(AR, ar, ar)
+
+dnl Checks for compiler characteristics
if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi
+AC_C_INLINE
dnl Check for OpenSSL/SSLeay directories.
AC_MSG_CHECKING([for OpenSSL/SSLeay directory])