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
e00f6b0
..
06fe37e
100644
(file)
--- a/
generated/globals.h
+++ b/
generated/globals.h
@@
-39,15
+39,6
@@
struct skeleton_data {
int more_globals;
};
int more_globals;
};
-// toys/lsb/dmesg.c
-
-struct dmesg_data {
- long level;
- long size;
-
- int color;
-};
-
// toys/lsb/hostname.c
struct hostname_data {
// toys/lsb/hostname.c
struct hostname_data {
@@
-558,6
+549,16
@@
struct diff_data {
int *offset[2];
};
int *offset[2];
};
+// toys/pending/dmesg.c
+
+struct dmesg_data {
+ long level;
+ long size;
+
+ int use_color;
+ struct sysinfo info;
+};
+
// toys/pending/dumpleases.c
struct dumpleases_data {
// toys/pending/dumpleases.c
struct dumpleases_data {
@@
-1039,7
+1040,6
@@
struct date_data {
char *setfmt;
char *showdate;
char *setfmt;
char *showdate;
- char *tz;
unsigned nano;
};
unsigned nano;
};
@@
-1128,6
+1128,7
@@
struct kill_data {
// toys/posix/ls.c
struct ls_data {
// toys/posix/ls.c
struct ls_data {
+ long ll;
char *color;
struct dirtree *files, *singledir;
char *color;
struct dirtree *files, *singledir;
@@
-1192,7
+1193,9
@@
struct od_data {
// toys/posix/paste.c
struct paste_data {
// toys/posix/paste.c
struct paste_data {
- char *delim;
+ char *d;
+
+ int files;
};
// toys/posix/patch.c
};
// toys/posix/patch.c
@@
-1384,7
+1387,6
@@
extern union global_union {
struct log_data log;
struct hello_data hello;
struct skeleton_data skeleton;
struct log_data log;
struct hello_data hello;
struct skeleton_data skeleton;
- struct dmesg_data dmesg;
struct hostname_data hostname;
struct killall_data killall;
struct md5sum_data md5sum;
struct hostname_data hostname;
struct killall_data killall;
struct md5sum_data md5sum;
@@
-1441,6
+1443,7
@@
extern union global_union {
struct dhcp6_data dhcp6;
struct dhcpd_data dhcpd;
struct diff_data diff;
struct dhcp6_data dhcp6;
struct dhcpd_data dhcpd;
struct diff_data diff;
+ struct dmesg_data dmesg;
struct dumpleases_data dumpleases;
struct expr_data expr;
struct fdisk_data fdisk;
struct dumpleases_data dumpleases;
struct expr_data expr;
struct fdisk_data fdisk;