diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2015-03-10 20:43:16 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2015-03-10 20:43:16 +0000 |
| commit | 26a222dc0c048fc071b548eadad7b80405a1b126 (patch) | |
| tree | e36ffa7f41ef247ce99648f9dc626305692c7ba8 /cddl/contrib/opensolaris/tools | |
| parent | 31830672a691ca2ab3d6c04ef7336d785636631e (diff) | |
| parent | 168b1a758bcc50e916d12c83c2e69e0890a9fe4c (diff) | |
| download | src-26a222dc0c048fc071b548eadad7b80405a1b126.tar.gz src-26a222dc0c048fc071b548eadad7b80405a1b126.zip | |
MFV r279822:
This merge is effectively a no-op since parts of it are already present
in FreeBSD, and the rest is incorrect since gelf_newehdr(3) and
gelf_newphdr(3) return pointers on FreeBSD rather than integers.
Illumos issue:
5589 improper use of NULL in tools/ctf
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=279861
Diffstat (limited to 'cddl/contrib/opensolaris/tools')
| -rw-r--r-- | cddl/contrib/opensolaris/tools/ctf/cvt/output.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/output.c b/cddl/contrib/opensolaris/tools/ctf/cvt/output.c index 3131e7fb85ee..3385e4b2d09f 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/output.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/output.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Routines for preparing tdata trees for conversion into CTF data, and * for placing the resulting data into an output file. |