aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-07-08 08:49:40 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2011-07-08 08:49:40 +0200
commit14bd16ac56e81e4912341cb731dc54af0dbe9e6c (patch)
tree729afe775b6a0b5f15e67ad93909d539aaf0429e /util-linux
parentacff3733bae6a9928d0109d5e4f93c32e82969d8 (diff)
downloadbusybox-w32-14bd16ac56e81e4912341cb731dc54af0dbe9e6c.tar.gz
busybox-w32-14bd16ac56e81e4912341cb731dc54af0dbe9e6c.tar.bz2
busybox-w32-14bd16ac56e81e4912341cb731dc54af0dbe9e6c.zip
more tweak for bionic
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/acpid.c19
-rw-r--r--util-linux/swaponoff.c7
2 files changed, 26 insertions, 0 deletions
diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index 2f27cfd1c..6e7321b02 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -33,6 +33,25 @@
33#include <syslog.h> 33#include <syslog.h>
34#include <linux/input.h> 34#include <linux/input.h>
35 35
36#ifndef EV_SW
37# define EV_SW 0x05
38#endif
39#ifndef EV_KEY
40# define EV_KEY 0x01
41#endif
42#ifndef SW_LID
43# define SW_LID 0x00
44#endif
45#ifndef SW_RFKILL_ALL
46# define SW_RFKILL_ALL 0x03
47#endif
48#ifndef KEY_POWER
49# define KEY_POWER 116 /* SC System Power Down */
50#endif
51#ifndef KEY_SLEEP
52# define KEY_SLEEP 142 /* SC System Sleep */
53#endif
54
36enum { 55enum {
37 OPT_c = (1 << 0), 56 OPT_c = (1 << 0),
38 OPT_d = (1 << 1), 57 OPT_d = (1 << 1),
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index dbefa4cf2..43ddb4031 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -25,6 +25,9 @@
25#include "libbb.h" 25#include "libbb.h"
26#include <mntent.h> 26#include <mntent.h>
27#include <sys/swap.h> 27#include <sys/swap.h>
28#ifndef __BIONIC__
29# include <sys/swap.h>
30#endif
28 31
29#if ENABLE_FEATURE_MOUNT_LABEL 32#if ENABLE_FEATURE_MOUNT_LABEL
30# include "volume_id.h" 33# include "volume_id.h"
@@ -32,6 +35,10 @@
32# define resolve_mount_spec(fsname) ((void)0) 35# define resolve_mount_spec(fsname) ((void)0)
33#endif 36#endif
34 37
38#ifndef MNTTYPE_SWAP
39# define MNTTYPE_SWAP "swap"
40#endif
41
35#if ENABLE_FEATURE_SWAPON_PRI 42#if ENABLE_FEATURE_SWAPON_PRI
36struct globals { 43struct globals {
37 int flags; 44 int flags;