diff options
| author | Elliott Hughes <enh@google.com> | 2020-04-01 21:36:16 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2020-04-01 21:41:57 -0700 |
| commit | 9d5ef4f7f89bd3416b32523bb4ce52281315b10c (patch) | |
| tree | 5ef66dfc0649ba59cf04faabb61c88fa2ed24cec /android/mac/generated/globals.h | |
| parent | 7af0f2f5500bf7c528170dba2e7b8629b219e75b (diff) | |
| parent | 85b02bddc0389487eaa8936de38441a1f95e08ea (diff) | |
| download | toybox-9d5ef4f7f89bd3416b32523bb4ce52281315b10c.tar.gz | |
Merge remote-tracking branch 'toybox/master' into HEAD
Also build rtcwake for the device.
Bug: http://b/152042947
Test: adb shell rtcwake -u -m on -s 2 -v
Test: treehugger
Change-Id: Icec631ca0d31b623f9e177790dc18a9c1a498315
Diffstat (limited to 'android/mac/generated/globals.h')
| -rw-r--r-- | android/mac/generated/globals.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/android/mac/generated/globals.h b/android/mac/generated/globals.h index d51c5855..00d6ed7c 100644 --- a/android/mac/generated/globals.h +++ b/android/mac/generated/globals.h @@ -277,8 +277,6 @@ struct hexedit_data { struct hwclock_data { char *f; - - int utc; }; // toys/other/ionice.c @@ -806,6 +804,15 @@ struct route_data { char *family; }; +// toys/pending/rtcwake.c + +struct rtcwake_data { + long long t, s; + char *m, *d; + + struct rtc_wkalrm alarm; +}; + // toys/pending/sh.c struct sh_data { @@ -1599,6 +1606,7 @@ extern union global_union { struct openvt_data openvt; struct readelf_data readelf; struct route_data route; + struct rtcwake_data rtcwake; struct sh_data sh; struct stty_data stty; struct sulogin_data sulogin; |