From fda2301943c10ee6e10a1c26d835bbff867adc1a Mon Sep 17 00:00:00 2001
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Wed, 29 May 2002 19:35:13 +0000
Subject: [PATCH] Since POSIX gives us plenary authority to define _t types,
 change __dlfunc_t to dlfunc_t to match what I have proposed to the Austin
 Group.  (This also makes it easier for applications to store these values
 before they decide what to do with them, e.g., in a wrapper function.)

---
 include/dlfcn.h       | 4 ++--
 lib/libc/gen/dlfunc.c | 4 ++--
 lib/libc/gen/dlopen.3 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/dlfcn.h b/include/dlfcn.h
index 38a38be07263..dcbb6c41078d 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -76,7 +76,7 @@ struct __dlfunc_arg {
 	int __dlfunc_dummy;
 };
 
-typedef void (*__dlfunc_t)(struct __dlfunc_arg);
+typedef void (*dlfunc_t)(struct __dlfunc_arg);
 
 __BEGIN_DECLS
 /* XSI functions first */
@@ -87,7 +87,7 @@ void *dlsym(void * /* __restrict */, const char * /* __restrict */);
 
 #if __BSD_VISIBLE
 int dladdr(const void *, Dl_info *);
-__dlfunc_t dlfunc(void * /* __restrict */, const char * /* __restrict */);
+dlfunc_t dlfunc(void * /* __restrict */, const char * /* __restrict */);
 void dllockinit(void *_context,
 		void *(*_lock_create)(void *_context),
 		void (*_rlock_acquire)(void *_lock),
diff --git a/lib/libc/gen/dlfunc.c b/lib/libc/gen/dlfunc.c
index e3b79595ffff..146711518f5b 100644
--- a/lib/libc/gen/dlfunc.c
+++ b/lib/libc/gen/dlfunc.c
@@ -16,12 +16,12 @@
  * have the same representation, which is true on all platforms FreeBSD
  * runs on, but is not guaranteed by the C standard.
  */
-__dlfunc_t
+dlfunc_t
 dlfunc(void *handle, const char *symbol)
 {
 	union {
 		void *d;
-		__dlfunc_t f;
+		dlfunc_t f;
 	} rv;
 
 	rv.d = dlsym(handle, symbol);
diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3
index aa7d00f4cf4b..a26a6cf2a2d2 100644
--- a/lib/libc/gen/dlopen.3
+++ b/lib/libc/gen/dlopen.3
@@ -46,7 +46,7 @@
 .Fn dlopen "const char *path" "int mode"
 .Ft void *
 .Fn dlsym "void *handle" "const char *symbol"
-.Ft __dlfunc_t
+.Ft dlfunc_t
 .Fn dlfunc "void *handle" "const char *symbol"
 .Ft const char *
 .Fn dlerror "void"