===================================================================
RCS file: /cvs/mandoc/mandoc_xr.c,v
retrieving revision 1.1
retrieving revision 1.4
diff -u -p -r1.1 -r1.4
--- mandoc/mandoc_xr.c	2017/07/01 09:47:30	1.1
+++ mandoc/mandoc_xr.c	2020/06/22 19:20:40	1.4
@@ -1,4 +1,4 @@
-/*	$Id: mandoc_xr.c,v 1.1 2017/07/01 09:47:30 schwarze Exp $ */
+/* $Id: mandoc_xr.c,v 1.4 2020/06/22 19:20:40 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -14,6 +14,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -59,17 +61,18 @@ mandoc_xr_reset(void)
 	xr_first = xr_last = NULL;
 }
 
-void
+int
 mandoc_xr_add(const char *sec, const char *name, int line, int pos)
 {
-	struct mandoc_xr	 *xr;
+	struct mandoc_xr	 *xr, *oxr;
 	const char		 *pend;
 	size_t			  ssz, nsz, tsz;
 	unsigned int		  slot;
+	int			  ret;
 	uint32_t		  hv;
 
 	if (xr_hash == NULL)
-		return;
+		return 0;
 
 	ssz = strlen(sec) + 1;
 	nsz = strlen(name) + 1;
@@ -80,21 +83,29 @@ mandoc_xr_add(const char *sec, const char *name, int l
 	xr->name = xr->hashkey + ssz;
 	xr->line = line;
 	xr->pos = pos;
+	xr->count = 1;
 	memcpy(xr->sec, sec, ssz);
 	memcpy(xr->name, name, nsz);
 
 	pend = xr->hashkey + tsz;
 	hv = ohash_interval(xr->hashkey, &pend);
 	slot = ohash_lookup_memory(xr_hash, xr->hashkey, tsz, hv);
-	if (ohash_find(xr_hash, slot) == NULL) {
+	if ((oxr = ohash_find(xr_hash, slot)) == NULL) {
 		ohash_insert(xr_hash, slot, xr);
 		if (xr_first == NULL)
 			xr_first = xr;
 		else
 			xr_last->next = xr;
 		xr_last = xr;
-	} else
-		free(xr);
+		return 0;
+	}
+
+	oxr->count++;
+	ret = (oxr->line == -1) ^ (xr->line == -1);
+	if (xr->line == -1)
+		oxr->line = -1;
+	free(xr);
+	return ret;
 }
 
 struct mandoc_xr *