projects
/
platform
/
upstream
/
glibc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix tst_wcscpy.c test.
[platform/upstream/glibc.git]
/
dlfcn
/
dlfcn.h
diff --git
a/dlfcn/dlfcn.h
b/dlfcn/dlfcn.h
index
7e373ed
..
d6b689f
100644
(file)
--- a/
dlfcn/dlfcn.h
+++ b/
dlfcn/dlfcn.h
@@
-1,6
+1,5
@@
/* User functions for run-time dynamic loading.
/* User functions for run-time dynamic loading.
- Copyright (C) 1995-1999,2000,2001,2003,2004,2006
- Free Software Foundation, Inc.
+ Copyright (C) 1995-2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@
-14,9
+13,8
@@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#ifndef _DLFCN_H
#define _DLFCN_H 1
#ifndef _DLFCN_H
#define _DLFCN_H 1
@@
-55,26
+53,26
@@
__BEGIN_DECLS
/* Open the shared object FILE and map it in; return a handle that can be
passed to `dlsym' to get symbol values from it. */
/* Open the shared object FILE and map it in; return a handle that can be
passed to `dlsym' to get symbol values from it. */
-extern void *dlopen (
__const char *__file, int __mode) __THROW
;
+extern void *dlopen (
const char *__file, int __mode) __THROWNL
;
/* Unmap and close a shared object opened by `dlopen'.
The handle cannot be used again after calling `dlclose'. */
/* Unmap and close a shared object opened by `dlopen'.
The handle cannot be used again after calling `dlclose'. */
-extern int dlclose (void *__handle) __THROW __nonnull ((1));
+extern int dlclose (void *__handle) __THROW
NL
__nonnull ((1));
/* Find the run-time address in the shared object HANDLE refers to
of the symbol called NAME. */
extern void *dlsym (void *__restrict __handle,
/* Find the run-time address in the shared object HANDLE refers to
of the symbol called NAME. */
extern void *dlsym (void *__restrict __handle,
-
__
const char *__restrict __name) __THROW __nonnull ((2));
+ const char *__restrict __name) __THROW __nonnull ((2));
#ifdef __USE_GNU
/* Like `dlopen', but request object to be allocated in a new namespace. */
#ifdef __USE_GNU
/* Like `dlopen', but request object to be allocated in a new namespace. */
-extern void *dlmopen (Lmid_t __nsid,
__const char *__file, int __mode) __THROW
;
+extern void *dlmopen (Lmid_t __nsid,
const char *__file, int __mode) __THROWNL
;
/* Find the run-time address in the shared object HANDLE refers to
of the symbol called NAME with VERSION. */
extern void *dlvsym (void *__restrict __handle,
/* Find the run-time address in the shared object HANDLE refers to
of the symbol called NAME with VERSION. */
extern void *dlvsym (void *__restrict __handle,
-
__
const char *__restrict __name,
-
__
const char *__restrict __version)
+ const char *__restrict __name,
+ const char *__restrict __version)
__THROW __nonnull ((2, 3));
#endif
__THROW __nonnull ((2, 3));
#endif
@@
-89,19
+87,19
@@
extern char *dlerror (void) __THROW;
`dladdr'. */
typedef struct
{
`dladdr'. */
typedef struct
{
-
__const char *dli_fname;
/* File name of defining object. */
+
const char *dli_fname;
/* File name of defining object. */
void *dli_fbase; /* Load address of that object. */
void *dli_fbase; /* Load address of that object. */
-
__const char *dli_sname;
/* Name of nearest symbol. */
+
const char *dli_sname;
/* Name of nearest symbol. */
void *dli_saddr; /* Exact value of nearest symbol. */
} Dl_info;
/* Fill in *INFO with the following information about ADDRESS.
Returns 0 iff no shared object's segments contain that address. */
void *dli_saddr; /* Exact value of nearest symbol. */
} Dl_info;
/* Fill in *INFO with the following information about ADDRESS.
Returns 0 iff no shared object's segments contain that address. */
-extern int dladdr (
__
const void *__address, Dl_info *__info)
+extern int dladdr (const void *__address, Dl_info *__info)
__THROW __nonnull ((2));
/* Same as `dladdr', but additionally sets *EXTRA_INFO according to FLAGS. */
__THROW __nonnull ((2));
/* Same as `dladdr', but additionally sets *EXTRA_INFO according to FLAGS. */
-extern int dladdr1 (
__
const void *__address, Dl_info *__info,
+extern int dladdr1 (const void *__address, Dl_info *__info,
void **__extra_info, int __flags) __THROW __nonnull ((2));
/* These are the possible values for the FLAGS argument to `dladdr1'.
void **__extra_info, int __flags) __THROW __nonnull ((2));
/* These are the possible values for the FLAGS argument to `dladdr1'.
@@
-164,7
+162,7
@@
enum
segment, or if the calling thread has not allocated a block for it. */
RTLD_DI_TLS_DATA = 10,
segment, or if the calling thread has not allocated a block for it. */
RTLD_DI_TLS_DATA = 10,
- RTLD_DI_MAX = 10
,
+ RTLD_DI_MAX = 10
};
};