From b27f3669043631b3cfbc4424e1868552669470c8 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 14 Jun 2012 13:30:39 +0200
Subject: [PATCH] s/__const/const/ in some header files.

---
 include/netdb.h  | 3 +--
 include/regex.h  | 3 +--
 include/stdio.h  | 4 ++--
 include/stdlib.h | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/netdb.h b/include/netdb.h
index 1f7e5fafe0..b21a031351 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -56,7 +56,6 @@
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
  *      From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
  * $FreeBSD: src/include/netdb.h,v 1.45 2009/03/14 20:04:28 das Exp $
- * $DragonFly: src/include/netdb.h,v 1.7 2008/10/04 22:09:16 swildner Exp $
  */
 
 #ifndef _NETDB_H_
@@ -271,7 +270,7 @@ int		getservbyport_r(int, const char *, struct servent *, char *,
 int		getservent_r(struct servent *, char *, size_t,
 			     struct servent **);
 void		herror(const char *);
-__const char	*hstrerror(int);
+const char	*hstrerror(int);
 int		innetgr(const char *, const char *, const char *, const char *);
 void		setnetgrent(const char *);
 #endif
diff --git a/include/regex.h b/include/regex.h
index 08594979e0..366dde6498 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -36,7 +36,6 @@
  *
  *	@(#)regex.h	8.2 (Berkeley) 1/3/94
  * $FreeBSD: src/include/regex.h,v 1.11 2004/07/12 06:07:26 tjr Exp $
- * $DragonFly: src/include/regex.h,v 1.3 2008/06/02 06:50:08 hasso Exp $
  */
 
 #ifndef _REGEX_H_
@@ -56,7 +55,7 @@ typedef	__size_t	size_t;
 typedef struct {
 	int re_magic;
 	size_t re_nsub;		/* number of parenthesized subexpressions */
-	__const char *re_endp;	/* end pointer for REG_PEND */
+	const char *re_endp;	/* end pointer for REG_PEND */
 	struct re_guts *re_g;	/* none of your business :-) */
 } regex_t;
 
diff --git a/include/stdio.h b/include/stdio.h
index 49635b5b7d..422ec8a47f 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -362,8 +362,8 @@ int	 vasprintf(char **, const char *, __va_list) __printflike(2, 0);
  * positive errno values.  Use strerror() or strerror_r() from <string.h>
  * instead.
  */
-extern __const int sys_nerr;
-extern __const char *__const sys_errlist[];
+extern const int sys_nerr;
+extern const char *const sys_errlist[];
 
 /*
  * Stdio function-access interface.
diff --git a/include/stdlib.h b/include/stdlib.h
index cdf086da07..b6e46a9bc0 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -265,7 +265,7 @@ char	*devname_r(dev_t, mode_t, char *, size_t);
 char	*fdevname(int);
 int	 fdevname_r(int, char *, size_t);
 int	 getloadavg(double [], int);
-__const char *
+const char *
 	 getprogname(void);
 
 int	 heapsort(void *, size_t, size_t, int (*)(const void *, const void *));
-- 
2.41.0