CVS commit: pkgsrc/pkgtools/libnbcompat/files/nbcompat

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Dec 31 11:25:08 UTC 2018

Modified Files:
        pkgsrc/pkgtools/libnbcompat/files/nbcompat: err.h

Log Message:
libnbcompat: fix PR pkg/33037

Thanks Stuart and sorry for the long time.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/libnbcompat/files/nbcompat/err.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/libnbcompat/files/nbcompat/err.h
diff -u pkgsrc/pkgtools/libnbcompat/files/nbcompat/err.h:1.4 pkgsrc/pkgtools/libnbcompat/files/nbcompat/err.h:1.5
--- pkgsrc/pkgtools/libnbcompat/files/nbcompat/err.h:1.4        Mon Aug 23 03:32:13 2004
+++ pkgsrc/pkgtools/libnbcompat/files/nbcompat/err.h    Mon Dec 31 11:25:08 2018
@@ -1,4 +1,4 @@
-/*     $NetBSD: err.h,v 1.4 2004/08/23 03:32:13 jlam Exp $     */
+/*     $NetBSD: err.h,v 1.5 2018/12/31 11:25:08 triaxx Exp $   */
 
 /*
  * Copyright (c) 1989, 1993
@@ -40,9 +40,11 @@
 
 #if HAVE_ERR_H
 # include <err.h>
-#endif
-
-#if !HAVE_ERR
+#else
+# if !HAVE_SYS_CDEFS_H
+#  include <nbcompat/cdefs.h>
+# endif
+# include <stdarg.h>
 void   err __P((int, const char *, ...));
 void   errx __P((int, const char *, ...));
 void   verr __P((int, const char *, va_list));
@@ -50,6 +52,10 @@ void verrx __P((int, const char *, va_li
 #endif
 
 #if !HAVE_WARN
+# if !HAVE_SYS_CDEFS_H
+#  include <nbcompat/cdefs.h>
+# endif
+# include <stdarg.h>
 void   warn __P((const char *, ...));
 void   warnx __P((const char *, ...));
 void   vwarn __P((const char *, va_list));