aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2007-02-02 10:53:55 -0500
committerRob Landley <rob@landley.net>2007-02-02 10:53:55 -0500
commit5a60e26fe8de2648689ff8c5659085b99f5891a0 (patch)
tree5275fc4463daece55b045bd9c6414e5294a4e492
parentbf284cbd49c99757ffb6367c4dfc584c01a3deab (diff)
downloadtoybox-5a60e26fe8de2648689ff8c5659085b99f5891a0.tar.gz
Trim a redundant definition that confuses older compilers. (Regression testing
against Red Hat 9.)
-rw-r--r--main.c1
-rw-r--r--toys/toylist.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/main.c b/main.c
index b264ec60..56d6eb37 100644
--- a/main.c
+++ b/main.c
@@ -22,6 +22,7 @@ struct toy_list toy_list[] = {
// global context for this applet.
struct toy_context toys;
+union toy_union toy;
char toybuf[4096];
struct toy_list *toy_find(char *name)
diff --git a/toys/toylist.h b/toys/toylist.h
index 9bdea7dc..715b5613 100644
--- a/toys/toylist.h
+++ b/toys/toylist.h
@@ -32,7 +32,7 @@ struct mke2fs_data {
// "E:jJ:L:m:O:"
#define MKE2FS_OPTSTRING "<1>2Fnqm#N#i#b#"
-union toy_union {
+extern union toy_union {
struct df_data df;
struct mke2fs_data mke2fs;
} toy;