print/transfig: Fix build with -fno-common

Fix the build of print/transfig when built with -fno-common, which is the
default with llvm 11.

MFH:		2020Q3 (implicit, -fno-common fixes, ok by joenum)
This commit is contained in:
Niclas Zeising
2020-08-25 12:27:34 +00:00
parent 6781b23317
commit 3473cdd1c7
3 changed files with 42 additions and 3 deletions

View File

@@ -0,0 +1,15 @@
--- fig2dev/dev/gengbx.c.orig 2020-08-25 12:18:01 UTC
+++ fig2dev/dev/gengbx.c
@@ -594,12 +594,6 @@ int define_aperture_for_arc(F_arc *a) {
char *cctype[] = { "none", "black", "white" };
-/* arrowhead arrays */
-Point points[50];
-int npoints;
-int arrowx1, arrowy1; /* first point of object */
-int arrowx2, arrowy2; /* second point of object */
-
static F_point *p;
/** Used to generate sequence numbers. */

View File

@@ -0,0 +1,15 @@
--- fig2dev/dev/genps.c.orig 2020-08-25 12:22:17 UTC
+++ fig2dev/dev/genps.c
@@ -96,8 +96,10 @@ static float fllx, flly, furx, fury;
/* arrowhead arrays */
Point bpoints[50], fpoints[50];
int nbpoints, nfpoints;
-Point bfillpoints[50], ffillpoints[50], clippoints[50];
-int nbfillpoints, nffillpoints, nclippoints;
+Point bfillpoints[50], ffillpoints[50];
+int nbfillpoints, nffillpoints;
+extern int nclippoints;
+extern Point clippoints[50];
int fpntx1, fpnty1; /* first point of object */
int fpntx2, fpnty2; /* second point of object */
int lpntx1, lpnty1; /* last point of object */

View File

@@ -1,6 +1,15 @@
--- fig2dev/fig2dev.h.orig 2010-03-16 11:53:20.000000000 -0700
+++ fig2dev/fig2dev.h 2011-06-16 22:23:27.000000000 -0700
@@ -214,7 +214,7 @@
--- fig2dev/fig2dev.h.orig 2010-03-16 18:53:20 UTC
+++ fig2dev/fig2dev.h
@@ -126,7 +126,7 @@ extern int PSisomap[];
extern char *prog, *from, *to;
extern char *name;
extern double font_size;
-Boolean correct_font_size; /* use correct font size */
+extern Boolean correct_font_size; /* use correct font size */
extern double mag, fontmag;
extern FILE *tfp;
@@ -214,7 +214,7 @@ struct Cmap {
#endif /* MAXPATHLEN */
#endif /* PATH_MAX */