diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
| commit | 5f00496ef2e39b976b062f196ff01a99fd4864a4 (patch) | |
| tree | 20be9cbc8f4b7ed3e616ce23552728083801e846 /usr/src/head/rtld_db.h | |
| parent | af59b1a40df03681c1c8129aea7b1f5f52f2bcea (diff) | |
| parent | 86bb58aec7165f8a0303564575c65e5a2ad58bf1 (diff) | |
| download | illumos-joyent-release-20140821.tar.gz | |
[illumos-gate merge]20140821release-20140821
commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
5092 env files don't need to define LOCKNAME by default
5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
5066 remove support for non-ANSI compilation
5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86
Manifests:
usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
usr/src/pkg/manifests/SUNWparted.mf (torch headers)
usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
usr/src/pkg/manifests/system-storage-parted.mf
Diffstat (limited to 'usr/src/head/rtld_db.h')
| -rw-r--r-- | usr/src/head/rtld_db.h | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/usr/src/head/rtld_db.h b/usr/src/head/rtld_db.h index c442087237..0bfe30057e 100644 --- a/usr/src/head/rtld_db.h +++ b/usr/src/head/rtld_db.h @@ -19,6 +19,8 @@ * CDDL HEADER END */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -26,9 +28,6 @@ #ifndef _RTLD_DB_H #define _RTLD_DB_H -#pragma ident "%Z%%M% %I% %E% SMI" - - #ifdef __cplusplus extern "C" { #endif @@ -135,11 +134,7 @@ typedef struct rd_loadobj { #define RD_CTL_SET_HELPPATH 0x01 /* Set the path used to find helpers */ typedef struct rd_agent rd_agent_t; -#ifdef __STDC__ typedef int rl_iter_f(const rd_loadobj_t *, void *); -#else -typedef int rl_iter_f(); -#endif /* @@ -175,7 +170,6 @@ struct ps_prochandle; /* * librtld_db.so entry points */ -#ifdef __STDC__ extern void rd_delete(rd_agent_t *); extern char *rd_errstr(rd_err_e rderr); extern rd_err_e rd_event_addr(rd_agent_t *, rd_event_e, rd_notify_t *); @@ -192,22 +186,6 @@ extern rd_err_e rd_plt_resolution(rd_agent_t *, psaddr_t, lwpid_t, psaddr_t, rd_plt_info_t *); extern rd_err_e rd_get_dyns(rd_agent_t *, psaddr_t, void **, size_t *); extern rd_err_e rd_reset(struct rd_agent *); -#else /* !__STDC__ */ -extern void rd_delete(); -extern char *rd_errstr(); -extern rd_err_e rd_event_addr(); -extern rd_err_e rd_event_enable(); -extern rd_err_e rd_event_getmsg(); -extern rd_err_e rd_init(); -extern rd_err_e rd_ctl(); -extern rd_err_e rd_loadobj_iter(); -extern void rd_log(); -extern rd_agent_t *rd_new(); -extern rd_err_e rd_objpad_enable(); -extern rd_err_e rd_plt_resolution(); -extern rd_err_e rd_get_dyns(); -extern rd_err_e rd_reset(); -#endif /* !__STDC__ */ #ifdef __cplusplus } |