summaryrefslogtreecommitdiff
path: root/pkgtools/libnbcompat/files/regerror.c
diff options
context:
space:
mode:
Diffstat (limited to 'pkgtools/libnbcompat/files/regerror.c')
-rw-r--r--pkgtools/libnbcompat/files/regerror.c51
1 files changed, 15 insertions, 36 deletions
diff --git a/pkgtools/libnbcompat/files/regerror.c b/pkgtools/libnbcompat/files/regerror.c
index 009bf91b474..aa2e7279af0 100644
--- a/pkgtools/libnbcompat/files/regerror.c
+++ b/pkgtools/libnbcompat/files/regerror.c
@@ -1,4 +1,4 @@
-/* $NetBSD: regerror.c,v 1.1 2004/08/16 17:24:56 jlam Exp $ */
+/* $NetBSD: regerror.c,v 1.2 2004/08/23 03:32:12 jlam Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -71,45 +71,28 @@
* @(#)regerror.c 8.4 (Berkeley) 3/20/94
*/
-#include "nbcompat.h"
-
-#if HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
+#include <nbcompat.h>
+#include <nbcompat/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)regerror.c 8.4 (Berkeley) 3/20/94";
#else
-__RCSID("$NetBSD: regerror.c,v 1.1 2004/08/16 17:24:56 jlam Exp $");
+__RCSID("$NetBSD: regerror.c,v 1.2 2004/08/23 03:32:12 jlam Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-/* #include "namespace.h" */
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
+#if 0
+#include "namespace.h"
#endif
+#include <nbcompat/types.h>
-#if HAVE_ASSERT_H
-#include <assert.h>
-#endif
-#if HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#if HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#if HAVE_REGEX_H
-#include <regex.h>
-#endif
-#if HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if HAVE_STRING_H
-#include <string.h>
-#endif
+#include <nbcompat/assert.h>
+#include <nbcompat/ctype.h>
+#include <nbcompat/limits.h>
+#include <nbcompat/regex.h>
+#include <nbcompat/stdio.h>
+#include <nbcompat/stdlib.h>
+#include <nbcompat/string.h>
#if 0
#ifdef __weak_alias
@@ -117,11 +100,7 @@ __weak_alias(regerror,_regerror)
#endif
#endif
-#include "utils.h"
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(cond) assert(cond)
-#endif
+#include "private/utils.h"
/* ========= begin header generated by ./mkh ========= */
#ifdef __cplusplus