diff options
| author | Dan Cross <cross@gajendra.net> | 2025-07-23 06:47:21 -0400 |
|---|---|---|
| committer | Dan Cross <cross@gajendra.net> | 2025-07-25 12:25:11 -0400 |
| commit | 156e745be9f6a1b19b0f8e2a931148786d7acad4 (patch) | |
| tree | c853bc58f9d7e88d84de2da625bc4dddcdf46780 /src/cmd/diff | |
| parent | 1e6e30e91e7a2712d9507072b5ff3b59a73e5dfe (diff) | |
| download | plan9port-156e745be9f6a1b19b0f8e2a931148786d7acad4.tar.gz plan9port-156e745be9f6a1b19b0f8e2a931148786d7acad4.zip | |
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.
Diffstat (limited to 'src/cmd/diff')
| -rw-r--r-- | src/cmd/diff/diff.h | 10 | ||||
| -rw-r--r-- | src/cmd/diff/main.c | 6 |
2 files changed, 11 insertions, 5 deletions
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; |