OSDN Git Service
(root)
/
android-x86
/
external-toybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'toybox/master' into HEAD
[android-x86/external-toybox.git]
/
generated
/
globals.h
diff --git
a/generated/globals.h
b/generated/globals.h
index
9d7b872
..
3a5d249
100644
(file)
--- a/
generated/globals.h
+++ b/
generated/globals.h
@@
-799,6
+799,15
@@
struct sh_data {
long lineno;
};
long lineno;
};
+// toys/pending/stty.c
+
+struct stty_data {
+ char *device;
+
+ int fd, col;
+ unsigned output_cols;
+};
+
// toys/pending/sulogin.c
struct sulogin_data {
// toys/pending/sulogin.c
struct sulogin_data {
@@
-1479,6
+1488,7
@@
extern union global_union {
struct route_data route;
struct setfattr_data setfattr;
struct sh_data sh;
struct route_data route;
struct setfattr_data setfattr;
struct sh_data sh;
+ struct stty_data stty;
struct sulogin_data sulogin;
struct syslogd_data syslogd;
struct tar_data tar;
struct sulogin_data sulogin;
struct syslogd_data syslogd;
struct tar_data tar;