Move definition of pmode to main.c instead of a compress.h. Avoids linker

issues with -fno-common.

ok deraadt@

diff --git a/usr.bin/compress/compress.h b/usr.bin/compress/compress.h
index b197bc8..56910c3 100644 (file)
--- 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 b721017..d047777 100644 (file)
--- 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;