===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/libmdoc.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- src/usr.bin/mandoc/libmdoc.h	2009/07/12 20:30:27	1.10
+++ src/usr.bin/mandoc/libmdoc.h	2009/07/12 21:08:29	1.11
@@ -1,4 +1,4 @@
-/*	$Id: libmdoc.h,v 1.10 2009/07/12 20:30:27 schwarze Exp $ */
+/*	$Id: libmdoc.h,v 1.11 2009/07/12 21:08:29 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -118,16 +118,12 @@
 
 __BEGIN_DECLS
 
-/* 
- * When GCC2 is deprecated, most of these can be reverted to #define
- * as mdoc_vXXX using __VA_ARGS__.  Until then, use real functions.
- */
-int		  mdoc_nerr(struct mdoc *, const struct mdoc_node *,
-			const char *, ...);
 int		  mdoc_warn(struct mdoc *, enum mdoc_warn, const char *, ...);
 int		  mdoc_pwarn(struct mdoc *, int, int,
 			enum mdoc_warn,const char *, ...);
 int		  mdoc_perr(struct mdoc *, int, int, const char *, ...);
+#define		  mdoc_nerr(m, n, t) \
+		  mdoc_err((m), (n)->line, (n)->pos, 0, (t))
 
 int		  mdoc_err(struct mdoc *, int, int, int, enum merr);
 int		  mdoc_verr(struct mdoc *, int, int, const char *, ...);