# HG changeset patch # User Rob Landley # Date 1170431635 18000 # Node ID cc0a6789f92ac2dbd2eef88a4f54721774fc0b61 # Parent 154070b2b28d1c8e9acaa2e1262cd53ff790946c Trim a redundant definition that confuses older compilers. (Regression testing against Red Hat 9.) diff -r 154070b2b28d -r cc0a6789f92a main.c --- a/main.c Thu Feb 01 17:39:14 2007 -0500 +++ b/main.c Fri Feb 02 10:53:55 2007 -0500 @@ -22,6 +22,7 @@ // global context for this applet. struct toy_context toys; +union toy_union toy; char toybuf[4096]; struct toy_list *toy_find(char *name) diff -r 154070b2b28d -r cc0a6789f92a toys/toylist.h --- a/toys/toylist.h Thu Feb 01 17:39:14 2007 -0500 +++ b/toys/toylist.h Fri Feb 02 10:53:55 2007 -0500 @@ -32,7 +32,7 @@ // "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;