mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-23 10:34:07 +00:00
Merge from gnulib
This incorporates: 2016-11-27 md4,md5,sha*: tune for recent glibc _STRING_INLINE_unaligned 2016-11-21 snippet/c++defs: Simplify _GL_CXXALIAS_* macros. * build-aux/snippet/c++defs.h: * lib/md5.c, lib/sha1.c, lib/sha256.c, lib/sha512.c: Copy from gnulib.
This commit is contained in:
parent
ebb96114d8
commit
f3fa5d7e22
@ -133,8 +133,11 @@
|
||||
static const struct _gl_ ## func ## _wrapper \
|
||||
{ \
|
||||
typedef rettype (*type) parameters; \
|
||||
inline type rpl () const { return ::rpl_func; } \
|
||||
inline operator type () const { return rpl (); } \
|
||||
\
|
||||
inline operator type () const \
|
||||
{ \
|
||||
return ::rpl_func; \
|
||||
} \
|
||||
} func = {}; \
|
||||
} \
|
||||
_GL_EXTERN_C int _gl_cxxalias_dummy
|
||||
@ -155,9 +158,11 @@
|
||||
static const struct _gl_ ## func ## _wrapper \
|
||||
{ \
|
||||
typedef rettype (*type) parameters; \
|
||||
inline type rpl () const \
|
||||
{ return reinterpret_cast<type>(::rpl_func); } \
|
||||
inline operator type () const { return rpl (); } \
|
||||
\
|
||||
inline operator type () const \
|
||||
{ \
|
||||
return reinterpret_cast<type>(::rpl_func); \
|
||||
} \
|
||||
} func = {}; \
|
||||
} \
|
||||
_GL_EXTERN_C int _gl_cxxalias_dummy
|
||||
@ -183,10 +188,13 @@
|
||||
static const struct _gl_ ## func ## _wrapper \
|
||||
{ \
|
||||
typedef rettype (*type) parameters; \
|
||||
inline type rpl () const { return ::func; } \
|
||||
inline operator type () const { return rpl (); } \
|
||||
\
|
||||
inline operator type () const \
|
||||
{ \
|
||||
return ::func; \
|
||||
} \
|
||||
} func = {}; \
|
||||
} \
|
||||
} \
|
||||
_GL_EXTERN_C int _gl_cxxalias_dummy
|
||||
#else
|
||||
# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
|
||||
@ -205,9 +213,11 @@
|
||||
static const struct _gl_ ## func ## _wrapper \
|
||||
{ \
|
||||
typedef rettype (*type) parameters; \
|
||||
inline type rpl () const \
|
||||
{ return reinterpret_cast<type>(::func); } \
|
||||
inline operator type () const { return rpl (); }\
|
||||
\
|
||||
inline operator type () const \
|
||||
{ \
|
||||
return reinterpret_cast<type>(::func); \
|
||||
} \
|
||||
} func = {}; \
|
||||
} \
|
||||
_GL_EXTERN_C int _gl_cxxalias_dummy
|
||||
@ -235,10 +245,10 @@
|
||||
{ \
|
||||
typedef rettype (*type) parameters; \
|
||||
\
|
||||
inline type rpl () const \
|
||||
{ return reinterpret_cast<type>((rettype2 (*) parameters2)(::func)); }\
|
||||
\
|
||||
inline operator type () const { return rpl (); } \
|
||||
inline operator type () const \
|
||||
{ \
|
||||
return reinterpret_cast<type>((rettype2 (*) parameters2)(::func)); \
|
||||
} \
|
||||
} func = {}; \
|
||||
} \
|
||||
_GL_EXTERN_C int _gl_cxxalias_dummy
|
||||
|
@ -259,7 +259,7 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
|
||||
/* Process available complete blocks. */
|
||||
if (len >= 64)
|
||||
{
|
||||
#if !_STRING_ARCH_unaligned
|
||||
#if !(_STRING_ARCH_unaligned || _STRING_INLINE_unaligned)
|
||||
# define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (uint32_t) != 0)
|
||||
if (UNALIGNED_P (buffer))
|
||||
while (len > 64)
|
||||
|
@ -246,7 +246,7 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx)
|
||||
/* Process available complete blocks. */
|
||||
if (len >= 64)
|
||||
{
|
||||
#if !_STRING_ARCH_unaligned
|
||||
#if !(_STRING_ARCH_unaligned || _STRING_INLINE_unaligned)
|
||||
# define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (uint32_t) != 0)
|
||||
if (UNALIGNED_P (buffer))
|
||||
while (len > 64)
|
||||
|
@ -379,7 +379,7 @@ sha256_process_bytes (const void *buffer, size_t len, struct sha256_ctx *ctx)
|
||||
/* Process available complete blocks. */
|
||||
if (len >= 64)
|
||||
{
|
||||
#if !_STRING_ARCH_unaligned
|
||||
#if !(_STRING_ARCH_unaligned || _STRING_INLINE_unaligned)
|
||||
# define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (uint32_t) != 0)
|
||||
if (UNALIGNED_P (buffer))
|
||||
while (len > 64)
|
||||
|
@ -387,7 +387,7 @@ sha512_process_bytes (const void *buffer, size_t len, struct sha512_ctx *ctx)
|
||||
/* Process available complete blocks. */
|
||||
if (len >= 128)
|
||||
{
|
||||
#if !_STRING_ARCH_unaligned
|
||||
#if !(_STRING_ARCH_unaligned || _STRING_INLINE_unaligned)
|
||||
# define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (u64) != 0)
|
||||
if (UNALIGNED_P (buffer))
|
||||
while (len > 128)
|
||||
|
Loading…
Reference in New Issue
Block a user