From 156e745be9f6a1b19b0f8e2a931148786d7acad4 Mon Sep 17 00:00:00 2001 From: Dan Cross Date: Wed, 23 Jul 2025 06:47:21 -0400 Subject: all: remove need for `-fcommon` Use `extern` where appropriate so that we can remove `-fcommon` on macOS and others. On macOS, `-fcommon` generates a number of linker warnings. I've tested building on macOS, Linux, FreeBSD, NetBSD, OpenBSD and illumos. I am not in a position to test on AIX or other more esoteric platforms, however. --- src/cmd/diff/diff.h | 10 +++++----- src/cmd/diff/main.c | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'src/cmd/diff') diff --git a/src/cmd/diff/diff.h b/src/cmd/diff/diff.h index 25e39c6c..94c7bf0d 100644 --- a/src/cmd/diff/diff.h +++ b/src/cmd/diff/diff.h @@ -1,10 +1,10 @@ #define stdout bstdout -char mode; /* '\0', 'e', 'f', 'h' */ -char bflag; /* ignore multiple and trailing blanks */ -char rflag; /* recurse down directory trees */ -char mflag; /* pseudo flag: doing multiple files, one dir */ -int anychange; +extern char mode; /* '\0', 'e', 'f', 'h' */ +extern char bflag; /* ignore multiple and trailing blanks */ +extern char rflag; /* recurse down directory trees */ +extern char mflag; /* pseudo flag: doing multiple files, one dir */ +extern int anychange; extern Biobuf stdout; extern int binary; diff --git a/src/cmd/diff/main.c b/src/cmd/diff/main.c index 2697cb88..fe1161aa 100644 --- a/src/cmd/diff/main.c +++ b/src/cmd/diff/main.c @@ -8,6 +8,12 @@ Biobuf stdout; +char mode; /* '\0', 'e', 'f', 'h' */ +char bflag; /* ignore multiple and trailing blanks */ +char rflag; /* recurse down directory trees */ +char mflag; /* pseudo flag: doing multiple files, one dir */ +int anychange; + static char *tmp[] = {"/tmp/diff1XXXXXXXXXXX", "/tmp/diff2XXXXXXXXXXX"}; static int whichtmp; static char *progname; -- cgit v1.2.3