svn commit: r279861 - head/cddl/contrib/opensolaris/tools/ctf/cvt

[Mark Johnston]

Author: markj
Date: Tue Mar 10 20:43:16 2015
New Revision: 279861
URL: https://svnweb.freebsd.org/changeset/base/279861

Log:
  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

Modified:
  head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)

Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c
==============================================================================
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Tue Mar 10 19:55:43 2015	(r279860)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Tue Mar 10 20:43:16 2015	(r279861)
@@ -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.