diff options
| author | mortimer <mortimer@cvs.openbsd.org> | 2021-01-18 00:46:59 +0000 |
|---|---|---|
| committer | mortimer <mortimer@cvs.openbsd.org> | 2021-01-18 00:46:59 +0000 |
| commit | e3cb51540f4806420abee6cad92eeb898ce971df (patch) | |
| tree | 09c64d2836d5fb34309c7699fd86361d45fcd53a /usr.bin | |
| parent | 6dbed5a70c9f27c7e8c54262e6bf7dd4b0797caf (diff) | |
Move definition of pmode to main.c instead of a compress.h. Avoids linker
issues with -fno-common.
ok deraadt@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/compress/compress.h | 4 | ||||
| -rw-r--r-- | usr.bin/compress/main.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/compress/compress.h b/usr.bin/compress/compress.h index b197bc81881..56910c384dc 100644 --- a/usr.bin/compress/compress.h +++ b/usr.bin/compress/compress.h @@ -1,4 +1,4 @@ -/* $OpenBSD: compress.h,v 1.13 2016/09/03 11:41:10 tedu Exp $ */ +/* $OpenBSD: compress.h,v 1.14 2021/01/18 00:46:58 mortimer Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -47,7 +47,7 @@ enum program_mode { MODE_COMP, MODE_DECOMP, MODE_CAT -} pmode; +}; /* * exit codes for compress diff --git a/usr.bin/compress/main.c b/usr.bin/compress/main.c index b7210174135..d047777f971 100644 --- a/usr.bin/compress/main.c +++ b/usr.bin/compress/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.97 2020/10/12 13:56:22 naddy Exp $ */ +/* $OpenBSD: main.c,v 1.98 2021/01/18 00:46:58 mortimer Exp $ */ /* * Copyright (c) 1992, 1993 @@ -50,6 +50,8 @@ #define min(a,b) ((a) < (b)? (a) : (b)) +enum program_mode pmode; + int cat, decomp, pipin, force, verbose, testmode, list, recurse, storename; extern char *__progname; |