diff --git a/unix/uxutils.c b/unix/uxutils.c index 467e5bcc..4a63ac86 100644 --- a/unix/uxutils.c +++ b/unix/uxutils.c @@ -1,36 +1,10 @@ #include "putty.h" #include "ssh.h" +#include "uxutils.h" + #if defined __arm__ || defined __aarch64__ -#ifdef HAVE_SYS_TYPES_H -#include -#endif - -#ifdef HAVE_SYS_AUXV_H -#include -#endif - -#ifdef HAVE_ASM_HWCAP_H -#include -#endif - -#if defined HAVE_GETAUXVAL -/* No code needed: getauxval has just the API we want already */ -#elif defined HAVE_ELF_AUX_INFO -/* Implement the simple getauxval API in terms of FreeBSD elf_aux_info */ -static inline u_long getauxval(int which) -{ - u_long toret; - if (elf_aux_info(which, &toret, sizeof(toret)) != 0) - return 0; /* elf_aux_info didn't work */ - return toret; -} -#else -/* Implement a stub getauxval which returns no capabilities */ -static inline u_long getauxval(int which) { return 0; } -#endif - bool platform_aes_hw_available(void) { #if defined HWCAP_AES diff --git a/unix/uxutils.h b/unix/uxutils.h new file mode 100644 index 00000000..4e8dc808 --- /dev/null +++ b/unix/uxutils.h @@ -0,0 +1,45 @@ +/* + * uxutils.h: header included only by uxutils.c. + * + * The only reason this is a header file instead of a source file is + * so that I can define 'static inline' functions which may or may not + * be used, without provoking a compiler warning when I turn out not + * to use them in the subsequent source file. + */ + +#ifndef PUTTY_UXUTILS_H +#define PUTTY_UXUTILS_H + +#if defined __arm__ || defined __aarch64__ + +#ifdef HAVE_SYS_TYPES_H +#include +#endif + +#ifdef HAVE_SYS_AUXV_H +#include +#endif + +#ifdef HAVE_ASM_HWCAP_H +#include +#endif + +#if defined HAVE_GETAUXVAL +/* No code needed: getauxval has just the API we want already */ +#elif defined HAVE_ELF_AUX_INFO +/* Implement the simple getauxval API in terms of FreeBSD elf_aux_info */ +static inline u_long getauxval(int which) +{ + u_long toret; + if (elf_aux_info(which, &toret, sizeof(toret)) != 0) + return 0; /* elf_aux_info didn't work */ + return toret; +} +#else +/* Implement a stub getauxval which returns no capabilities */ +static inline u_long getauxval(int which) { return 0; } +#endif + +#endif /* defined __arm__ || defined __aarch64__ */ + +#endif /* PUTTY_UXUTILS_H */