From 8fe8a39ea9f7811d9c1e2e48a46932561906883f Mon Sep 17 00:00:00 2001
From: John Levon <john.levon@joyent.com>
Date: Fri, 12 Oct 2018 17:05:41 +0000
Subject: Revert "OS-7270 ctfconvert doesn't handle DW_AT_specification":
 breaks build Reviewed by: Ryan Zezeski <rpz@joyent.com> Approved by: Ryan
 Zezeski <rpz@joyent.com>

---
 usr/src/tools/ctf/common/ctf_headers.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'usr/src/tools/ctf/common/ctf_headers.h')

diff --git a/usr/src/tools/ctf/common/ctf_headers.h b/usr/src/tools/ctf/common/ctf_headers.h
index 7cad0d2a27..a63690be77 100644
--- a/usr/src/tools/ctf/common/ctf_headers.h
+++ b/usr/src/tools/ctf/common/ctf_headers.h
@@ -22,7 +22,6 @@
 /*
  * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- * Copyright 2018 Joyent, Inc.
  */
 
 #ifndef _CTF_HEADERS_H
@@ -33,7 +32,7 @@
  * the tools need to include the headers installed on the build system,
  * rather than those in the ON source tree. However, some of the headers
  * required by the tools are part of the ON source tree, but not delivered
- * as part of illumos.  These include the following:
+ * as part of Solaris.  These include the following:
  *
  * $(SRC)/lib/libctf/common/libctf.h
  * $(SRC)/lib/libctf/common/libctf_impl.h
@@ -63,14 +62,8 @@
  *    This last -I include is needed in order to prevent a build failure
  *    when <sys/ctf_api.h> is included via a nested #include rather than
  *    an explicit path #include.
- *
- * Finally, to make life easier, we also include the current definitions of the
- * ccompile.h and sysmacros.h headers to make it so we have to rely less on the
- * build system contents.
  */
 
-#include <uts/common/sys/sysmacros.h>
-#include <uts/common/sys/ccompile.h>
 #include <uts/common/sys/ctf.h>
 #include <uts/common/sys/ctf_api.h>
 #include <common/ctf/ctf_impl.h>
-- 
cgit v1.2.3