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 d183b1f..5e4f8ce 100644 (file)
--- a/generated/globals.h
+++ b/generated/globals.h
@@ -39,6 +39,16 @@ struct skeleton_data {
   int more_globals;
 };
 
+// toys/lsb/dmesg.c
+
+struct dmesg_data {
+  long level;
+  long size;
+
+  int use_color;
+  time_t tea;
+};
+
 // toys/lsb/hostname.c
 
 struct hostname_data {
@@ -549,16 +559,6 @@ struct diff_data {
   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 {
@@ -1107,13 +1107,17 @@ struct grep_data {
   long a;
   long b;
   long c;
+  struct arg_list *M;
+  struct arg_list *S;
 
   char indelim, outdelim;
+  int found;
 };
 
 // toys/posix/head.c
 
 struct head_data {
+  long bytes;
   long lines;
   int file_no;
 };
@@ -1323,6 +1327,7 @@ struct split_data {
 
 struct strings_data {
   long num;
+  char *t;
 };
 
 // toys/posix/tail.c
@@ -1393,6 +1398,7 @@ extern union global_union {
        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;
@@ -1449,7 +1455,6 @@ extern union global_union {
        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;