===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- mandoc/roff.c	2017/06/18 17:36:03	1.315
+++ mandoc/roff.c	2017/06/24 14:38:33	1.316
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.315 2017/06/18 17:36:03 schwarze Exp $ */
+/*	$Id: roff.c,v 1.316 2017/06/24 14:38:33 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -819,14 +819,14 @@ roff_man_free(struct roff_man *man)
 
 struct roff_man *
 roff_man_alloc(struct roff *roff, struct mparse *parse,
-	const char *defos, int quick)
+	const char *os_s, int quick)
 {
 	struct roff_man *man;
 
 	man = mandoc_calloc(1, sizeof(*man));
 	man->parse = parse;
 	man->roff = roff;
-	man->defos = defos;
+	man->os_s = os_s;
 	man->quick = quick;
 	roff_man_alloc1(man);
 	roff->man = man;
@@ -1138,7 +1138,7 @@ roff_res(struct roff *r, struct buf *buf, int ln, int 
 	size_t		 maxl;  /* expected length of the escape name */
 	size_t		 naml;	/* actual length of the escape name */
 	enum mandoc_esc	 esc;	/* type of the escape sequence */
-	enum mdoc_os	 os_e;	/* kind of RCS id seen */
+	enum mandoc_os	 os_e;	/* kind of RCS id seen */
 	int		 inaml;	/* length returned from mandoc_escape() */
 	int		 expand_count;	/* to avoid infinite loops */
 	int		 npos;	/* position in numeric expression */
@@ -1161,10 +1161,10 @@ roff_res(struct roff *r, struct buf *buf, int ln, int 
 		/* Comment found, look for RCS id. */
 
 		if ((cp = strstr(stesc, "$" "OpenBSD")) != NULL) {
-			os_e = MDOC_OS_OPENBSD;
+			os_e = MANDOC_OS_OPENBSD;
 			cp += 8;
 		} else if ((cp = strstr(stesc, "$" "NetBSD")) != NULL) {
-			os_e = MDOC_OS_NETBSD;
+			os_e = MANDOC_OS_NETBSD;
 			cp += 7;
 		}
 		if (cp != NULL &&