From ee9e7edbc18cdc37262feae9eb65ee4be68bf52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Thu, 20 May 2021 18:27:10 +0200 Subject: Solaris: handle ERR macro redefinitions On OmniOS /usr/include/sys/regset.h redefines ERR to 13 - \r, breaking the Enter key. Since ncruses macros use the ERR macro, we can not use another name. Closes: #634 --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d75422d8..78250621 100644 --- a/configure.ac +++ b/configure.ac @@ -298,6 +298,11 @@ fi if test "$enable_static" = yes; then AC_SEARCH_LIBS([Gpm_GetEvent], [gpm]) fi +if test "$my_htop_platform" = "solaris"; then + # On OmniOS /usr/include/sys/regset.h redefines ERR to 13 - \r, breaking the Enter key. + # Since ncruses macros use the ERR macro, we can not use another name. + AC_DEFINE([ERR], [(-1)], [Predefine ncurses macro.]) +fi AC_ARG_ENABLE([hwloc], -- cgit v1.2.3