From: natano Date: Fri, 16 Jun 2017 06:46:54 +0000 (+0000) Subject: s/CPU_LIDSUSPEND/CPU_LIDACTION/ X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=02638669758e1736439526eaf4359c6856662de0;p=openbsd s/CPU_LIDSUSPEND/CPU_LIDACTION/ ok mlarkin --- diff --git a/sbin/init/init.c b/sbin/init/init.c index 1c0e4ce5e73..f3d84463815 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.64 2017/05/03 09:51:39 mestre Exp $ */ +/* $OpenBSD: init.c,v 1.65 2017/06/16 06:46:54 natano Exp $ */ /* $NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $ */ /*- @@ -1325,7 +1325,7 @@ f_nice_death(void) static const int death_sigs[3] = { SIGHUP, SIGTERM, SIGKILL }; int status; -#ifdef CPU_LIDSUSPEND +#ifdef CPU_LIDACTION int mib[] = {CTL_MACHDEP, CPU_LIDACTION}; int lidaction = 0; diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 8f1f524d72c..dd85d0d9c8c 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: reboot.c,v 1.36 2017/03/02 10:38:09 natano Exp $ */ +/* $OpenBSD: reboot.c,v 1.37 2017/06/16 06:46:54 natano Exp $ */ /* $NetBSD: reboot.c,v 1.8 1995/10/05 05:36:22 mycroft Exp $ */ /* @@ -112,7 +112,7 @@ main(int argc, char *argv[]) if (geteuid()) errx(1, "%s", strerror(EPERM)); -#ifdef CPU_LIDSUSPEND +#ifdef CPU_LIDACTION if (howto & RB_POWERDOWN) { /* Disable suspending on laptop lid close */ int mib[] = {CTL_MACHDEP, CPU_LIDACTION}; @@ -122,7 +122,7 @@ main(int argc, char *argv[]) sizeof(lidaction)) == -1 && errno != EOPNOTSUPP) warn("sysctl"); } -#endif /* CPU_LIDSUSPEND */ +#endif /* CPU_LIDACTION */ if (qflag) { reboot(howto);