* lib/sha1.c (set_uint32): Now static, not static inline. * m4/sha1.m4 (gl_SHA1): Do not require AC_C_INLINE. --- ChangeLog | 4 ++++ lib/sha1.c | 2 +- m4/sha1.m4 | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 1f3e5bc..441dfe0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-08-18 Paul Eggert <[email protected]> + crypto/sha1: avoid 'static inline' + * lib/sha1.c (set_uint32): Now static, not static inline. + * m4/sha1.m4 (gl_SHA1): Do not require AC_C_INLINE. + mktime: avoid 'static inline' * lib/mktime.c (leapyear, ydhms_diff): Now static, not static inline. * m4/mktime.m4 (gl_PREREQ_MKTIME): Do not require AC_C_INLINE. diff --git a/lib/sha1.c b/lib/sha1.c index db4ab42..1f67184 100644 --- a/lib/sha1.c +++ b/lib/sha1.c @@ -70,7 +70,7 @@ sha1_init_ctx (struct sha1_ctx *ctx) /* Copy the 4 byte value from v into the memory location pointed to by *cp, If your architecture allows unaligned access this is equivalent to * (uint32_t *) cp = v */ -static inline void +static void set_uint32 (char *cp, uint32_t v) { memcpy (cp, &v, sizeof v); diff --git a/m4/sha1.m4 b/m4/sha1.m4 index 7619825..29fa485 100644 --- a/m4/sha1.m4 +++ b/m4/sha1.m4 @@ -1,4 +1,4 @@ -# sha1.m4 serial 10 +# sha1.m4 serial 11 dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,6 +8,5 @@ AC_DEFUN([gl_SHA1], [ dnl Prerequisites of lib/sha1.c. AC_REQUIRE([gl_BIGENDIAN]) - AC_REQUIRE([AC_C_INLINE]) : ]) -- 1.7.6.5
