From 156e745be9f6a1b19b0f8e2a931148786d7acad4 Mon Sep 17 00:00:00 2001
From: Dan Cross <cross@gajendra.net>
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/fontsrv/a.h    | 4 ++--
 src/cmd/fontsrv/main.c | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/cmd/fontsrv')

diff --git a/src/cmd/fontsrv/a.h b/src/cmd/fontsrv/a.h
index 2eeb404f..5dc82f35 100644
--- a/src/cmd/fontsrv/a.h
+++ b/src/cmd/fontsrv/a.h
@@ -1,6 +1,6 @@
 typedef struct XFont XFont;
-XFont *xfont;
-int nxfont;
+extern XFont *xfont;
+extern int nxfont;
 
 enum {
 	SubfontSize = 32,
diff --git a/src/cmd/fontsrv/main.c b/src/cmd/fontsrv/main.c
index fd629801..e6f7b9c5 100644
--- a/src/cmd/fontsrv/main.c
+++ b/src/cmd/fontsrv/main.c
@@ -13,6 +13,9 @@
 
 #include "a.h"
 
+XFont *xfont;
+int nxfont;
+
 void
 usage(void)
 {
-- 
cgit v1.2.3