mirror of https://github.com/xzeldon/htop.git
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
This commit is contained in:
parent
a62987c787
commit
ee9e7edbc1
|
@ -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],
|
||||
|
|
|
@ -12,7 +12,15 @@ in the source distribution for its full text.
|
|||
#include "config.h" // IWYU pragma: keep
|
||||
|
||||
#include <kstat.h>
|
||||
|
||||
/* 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.
|
||||
*/
|
||||
#undef ERR
|
||||
#include <libproc.h>
|
||||
#undef ERR
|
||||
#define ERR (-1)
|
||||
|
||||
#include <signal.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
|
|
|
@ -12,7 +12,14 @@ in the source distribution for its full text.
|
|||
|
||||
#include <zone.h>
|
||||
#include <sys/proc.h>
|
||||
|
||||
/* 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.
|
||||
*/
|
||||
#undef ERR
|
||||
#include <libproc.h>
|
||||
#undef ERR
|
||||
#define ERR (-1)
|
||||
|
||||
#include "Settings.h"
|
||||
|
||||
|
|
Loading…
Reference in New Issue