From d3ccdc8a77ff99762a3639bfde4c7a8da1f0beec Mon Sep 17 00:00:00 2001
From: Hugo Buddelmeijer <hugo@buddelmeijer.nl>
Date: Tue, 10 Mar 2026 20:47:28 +0100
Subject: [PATCH] Fix duplicate global definitions

---
 src/fits/fitscat.c      | 3 +++
 src/fits/fitscat.h      | 2 +-
 src/fits/fitscat_defs.h | 2 +-
 src/globals.h           | 2 +-
 src/prefs.c             | 2 ++
 src/prefs.h             | 2 +-
 src/threads.c           | 2 ++
 src/threads.h           | 2 +-
 8 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/fits/fitscat.c b/src/fits/fitscat.c
index cd90e24..acfa6eb 100644
--- a/src/fits/fitscat.c
+++ b/src/fits/fitscat.c
@@ -42,6 +42,9 @@
 #include	"fitscat_defs.h"
 #include	"fitscat.h"
 
+int		bswapflag;
+char		gstr[MAXCHAR];
+
 /****** about_cat **************************************************************
 PROTO	int about_cat(catstruct *cat, FILE *stream)
 PURPOSE	Print some info about a catalog.
diff --git a/src/fits/fitscat.h b/src/fits/fitscat.h
index 41ebb72..298c371 100644
--- a/src/fits/fitscat.h
+++ b/src/fits/fitscat.h
@@ -333,6 +333,6 @@ extern  void	error(int, char *, char *),
 		warning(char *msg1, char *msg2);
 
 
-int		bswapflag;
+extern int	bswapflag;
 
 #endif
diff --git a/src/fits/fitscat_defs.h b/src/fits/fitscat_defs.h
index 7dc4ea8..997e39f 100644
--- a/src/fits/fitscat_defs.h
+++ b/src/fits/fitscat_defs.h
@@ -86,7 +86,7 @@ typedef	unsigned char	BYTE;			/* a byte */
 typedef	int		LONG;			/* for DEC-Alpha... */
 	
 /*----------------------------- Internal constants --------------------------*/
-char		gstr[MAXCHAR];
+extern char	gstr[MAXCHAR];
 
 /*----------------------------- External constants --------------------------*/
 
diff --git a/src/globals.h b/src/globals.h
index eba59d2..69f6387 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -29,7 +29,7 @@
 #include	"types.h"
 
 /*----------------------- miscellaneous variables ---------------------------*/
-char		gstr[MAXCHAR];
+extern char	gstr[MAXCHAR];
 
 /*------------------------------- functions ---------------------------------*/
 extern double	counter_seconds();
diff --git a/src/prefs.c b/src/prefs.c
index 89741bd..553be9e 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -50,6 +50,8 @@
 #include 	"prefs.h"
 #include	"preflist.h"
 
+prefstruct	prefs;
+
 /********************************* dumpprefs ********************************/
 /*
 Print the default preference parameters.
diff --git a/src/prefs.h b/src/prefs.h
index eeb4c58..0537262 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -123,7 +123,7 @@ typedef struct
   double	time_diff;		/* Execution time */
   }	prefstruct;
 
-prefstruct	prefs;
+extern prefstruct	prefs;
 
 /*-------------------------------- protos -----------------------------------*/
 extern char	*list_to_str(char *listname);
diff --git a/src/threads.c b/src/threads.c
index 3dcf523..bb7bb17 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -47,6 +47,8 @@
 
 #ifdef USE_THREADS
 
+int		nproc;
+
 /******* threads_gate_init ***************************************************
 PROTO	threads_gate_t *threads_gate_init(int nthreads, void (*func)(void))
 PURPOSE	Create a new gate.
diff --git a/src/threads.h b/src/threads.h
index 84ec0d3..740fa1b 100644
--- a/src/threads.h
+++ b/src/threads.h
@@ -129,7 +129,7 @@ typedef struct _threads_gate_t
   } threads_gate_t;
 
 /*----------------------------- Global variables ----------------------------*/
- int		nproc;	/* Number of child threads */
+extern int	nproc;	/* Number of child threads */
 
 /*--------------------------------- Functions -------------------------------*/
 threads_gate_t	*threads_gate_init(int nthreads, void (*func)(void));