diff options
| author | wollman <wollman@FreeBSD.org> | 2002-05-29 19:35:13 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 2002-05-29 19:35:13 +0000 |
| commit | 7d20b8cfe0d52642a6c9bf94faeb75a478e91e21 (patch) | |
| tree | 137ba4d0ee0c9d32e3e8610e6a77f9429ffb3ba3 | |
| parent | 7dff1045f4a028bb1112d46ddf0ee33aec3752b9 (diff) | |
| download | FreeBSD-src-7d20b8cfe0d52642a6c9bf94faeb75a478e91e21.zip FreeBSD-src-7d20b8cfe0d52642a6c9bf94faeb75a478e91e21.tar.gz | |
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.)
| -rw-r--r-- | include/dlfcn.h | 4 | ||||
| -rw-r--r-- | lib/libc/gen/dlfunc.c | 4 | ||||
| -rw-r--r-- | lib/libc/gen/dlopen.3 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/dlfcn.h b/include/dlfcn.h index 38a38be..dcbb6c4 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 e3b7959..1467115 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 aa7d00f..a26a6cf 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" |
