diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-12 13:07:00 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-12 13:07:00 +0000 |
| commit | 36d96a9356a3173b5bb6f9081fac31e2afc8c8d9 (patch) | |
| tree | 5e8b504fd210dbd136a7cbc8dc0ff61c49726157 /usr/src/lib/libctf/common/libctf.h | |
| parent | 687c392b16815890c7ea0bb7d2c60e26a2b128fc (diff) | |
| parent | 2385a4422808a5effb54aad5f1e17f0fd1ed7f84 (diff) | |
| download | illumos-joyent-36d96a9356a3173b5bb6f9081fac31e2afc8c8d9.tar.gz | |
[illumos-gate merge]
commit 2385a4422808a5effb54aad5f1e17f0fd1ed7f84
10110 get_tz_countries shouldn't check array for NULL
commit 933ae53f0bf0708d7bf2756d3f21936a0d5fad82
10141 smatch fix for zoneadmd
commit a0b03b161c4df3cfc54fbc741db09b3bdc23ffba
10330 merge recent ZoL vdev and metaslab changes
commit bc1f688b4872ace323eaddbb1a6365d054e7bf56
6885 CTF Everywhere Part 1
6886 Want ctfdiff
6887 ctfdump should be written in terms of libctf
6888 ctfmerge should be implemented in terms of libctf
6889 ctfconvert should be implemented in terms of libctf
6890 Want general workq
6891 Want general mergeq
6892 ctf_add_encoded assigns() incorrect byte size to types
6893 ctf_add_{struct,union,enum} can reuse forwards
6894 ctf_add_{struct,union,enum} occasionally forget to dirty the ctf_file_t
6895 ctf_add_member could better handle bitfields
6896 ctf_type_size() reports wrong size for forwards
6897 Want libctf ctf_kind_name() function
6898 Want libctf function to set struct/union size
commit 2b987d42b0ad07d74e39b18a2498709e5195d7e3
9696 add /etc/system.d support
commit 7d732bb0c50cbe80dedb2fdedd5ecfa51b90c302
10138 smatch fixes for usr/src/cmd/sgs
Conflicts:
usr/src/tools/ctf/Makefile.ctf
usr/src/test/util-tests/tests/Makefile
usr/src/test/util-tests/runfiles/default.run
usr/src/pkg/manifests/system-test-utiltest.mf
usr/src/lib/libctf/common/mapfile-vers
usr/src/lib/libctf/common/libctf.h
usr/src/lib/libctf/common/ctf_lib.c
usr/src/lib/libctf/common/ctf_convert.c
usr/src/common/ctf/ctf_types.c
usr/src/uts/common/fs/zfs/sys/metaslab.h
usr/src/uts/common/fs/zfs/vdev_initialize.c
usr/src/uts/common/fs/zfs/metaslab.c
Diffstat (limited to 'usr/src/lib/libctf/common/libctf.h')
| -rw-r--r-- | usr/src/lib/libctf/common/libctf.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/usr/src/lib/libctf/common/libctf.h b/usr/src/lib/libctf/common/libctf.h index a5c5027048..f4960eef0a 100644 --- a/usr/src/lib/libctf/common/libctf.h +++ b/usr/src/lib/libctf/common/libctf.h @@ -76,8 +76,6 @@ extern int ctf_diff_objects(ctf_diff_t *, ctf_diff_obj_f, void *); extern void ctf_diff_fini(ctf_diff_t *); #define CTF_CONVERT_F_IGNNONC 0x01 -extern ctf_file_t *ctf_elfconvert(int, Elf *, const char *, uint_t, uint_t, - int *, char *, size_t); extern ctf_file_t *ctf_fdconvert(int, const char *, uint_t, uint_t, int *, char *, size_t); |