summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-15 23:26:05 +0000
committerKarl Berry <karl@freefriends.org>2020-02-15 23:26:05 +0000
commit2220fb700a2f4b2f8fd317094fb4f01d39500c22 (patch)
tree67a743b457fde2c8523dfe031882211956b8e28e
parentc9e4d3609b9024d4f14214ed64e9ee63b445e82b (diff)
extern dpi to appease -fno-common
git-svn-id: svn://tug.org/texlive/trunk@53796 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/ttf2pk2/ChangeLog5
-rw-r--r--Build/source/texk/ttf2pk2/pklib.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/Build/source/texk/ttf2pk2/ChangeLog b/Build/source/texk/ttf2pk2/ChangeLog
index fd892ef5643..0beb283f9a0 100644
--- a/Build/source/texk/ttf2pk2/ChangeLog
+++ b/Build/source/texk/ttf2pk2/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-16 Karl Berry <karl@tug.org>
+
+ * pklib.c (dpi): declare extern, as also defined in ftlib.c,
+ to appease -fno-common.
+
2015-07-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Better dependencies for 'make check'.
diff --git a/Build/source/texk/ttf2pk2/pklib.c b/Build/source/texk/ttf2pk2/pklib.c
index 49f64601729..bce45f2afda 100644
--- a/Build/source/texk/ttf2pk2/pklib.c
+++ b/Build/source/texk/ttf2pk2/pklib.c
@@ -6,6 +6,9 @@
* Copyright 1997-1999, 2000 by
* Frederic Loyer <loyer@ensta.fr>
* Werner Lemberg <wl@gnu.org>
+ *
+ * Trivial declaration change in 2020 by
+ * Karl Berry <tex-live@tug.org>
*/
/*
@@ -64,7 +67,7 @@
#define PK_POST (char)245
#define PK_NOP (char)246
-int dpi;
+extern int dpi; /* defined in ftlib.c, avoiding -fno-common failure */
FILE *pk_file;