X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=generated%2Fglobals.h;h=06fe37e628ac873709038c2b132c85f7b34bee82;hb=52a5544db41867cdf4a61a7b6515e6f7bd9d9f25;hp=e00f6b0a05d6aecc638b464cc1230676ed23d1c2;hpb=c02f8efaa4f6b9a01c3faa667db58c60aae27710;p=android-x86%2Fexternal-toybox.git

diff --git a/generated/globals.h b/generated/globals.h
index e00f6b0a..06fe37e6 100644
--- a/generated/globals.h
+++ b/generated/globals.h
@@ -39,15 +39,6 @@ struct skeleton_data {
   int more_globals;
 };
 
-// toys/lsb/dmesg.c
-
-struct dmesg_data {
-  long level;
-  long size;
-
-  int color;
-};
-
 // toys/lsb/hostname.c
 
 struct hostname_data {
@@ -558,6 +549,16 @@ 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 {
@@ -1039,7 +1040,6 @@ struct date_data {
   char *setfmt;
   char *showdate;
 
-  char *tz;
   unsigned nano;
 };
 
@@ -1128,6 +1128,7 @@ struct kill_data {
 // toys/posix/ls.c
 
 struct ls_data {
+  long ll;
   char *color;
 
   struct dirtree *files, *singledir;
@@ -1192,7 +1193,9 @@ struct od_data {
 // toys/posix/paste.c
 
 struct paste_data {
-  char *delim;
+  char *d;
+
+  int files;
 };
 
 // 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 dmesg_data dmesg;
 	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 dmesg_data dmesg;
 	struct dumpleases_data dumpleases;
 	struct expr_data expr;
 	struct fdisk_data fdisk;