From 24a27fd0d17d515b00097199de60fa85a76a95df Mon Sep 17 00:00:00 2001 From: tb <> Date: Thu, 16 Feb 2023 08:38:17 +0000 Subject: libressl *_namespace.h: adjust *_ALIAS() to require a semicolon LCRYPTO_ALIAS() and LSSL_ALIAS() contained a trailing semicolon. This does not conform to style(9), breaks editors and ctags and (most importantly) my workflow. Fix this by neutering them with asm("") so that -Wpedantic doesn't complain. There's precedent in libc's namespace.h fix suggested by & ok jsing --- src/lib/libcrypto/hidden/crypto_namespace.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/libcrypto/hidden') diff --git a/src/lib/libcrypto/hidden/crypto_namespace.h b/src/lib/libcrypto/hidden/crypto_namespace.h index 6ceef26e2d..5bf9b4d4da 100644 --- a/src/lib/libcrypto/hidden/crypto_namespace.h +++ b/src/lib/libcrypto/hidden/crypto_namespace.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto_namespace.h,v 1.1 2022/11/11 11:25:18 beck Exp $ */ +/* $OpenBSD: crypto_namespace.h,v 1.2 2023/02/16 08:38:17 tb Exp $ */ /* * Copyright (c) 2016 Philip Guenther * @@ -30,7 +30,7 @@ # define LCRYPTO_USED(x) __attribute__((visibility("hidden"))) \ typeof(x) x asm("_lcry_"#x) # define LCRYPTO_ALIAS1(pre,x) asm(".global "#pre#x"; "#pre#x" = _lcry_"#x) -# define LCRYPTO_ALIAS(x) LCRYPTO_ALIAS1(,x); LCRYPTO_ALIAS1(_libre_,x); +# define LCRYPTO_ALIAS(x) LCRYPTO_ALIAS1(,x); LCRYPTO_ALIAS1(_libre_,x) #else # define LCRYPTO_USED(x) typeof(x) x asm("_libre_"#x) #endif @@ -38,7 +38,7 @@ # define LCRYPTO_UNUSED(x) # define LCRYPTO_USED(x) # define LCRYPTO_ALIAS1(pre,x) -# define LCRYPTO_ALIAS(x) +# define LCRYPTO_ALIAS(x) asm("") #endif #endif /* _LIBCRYPTO_CRYPTO_NAMESPACE_H_ */ -- cgit v1.2.3-55-g6feb