1 files changed, 2 insertions, 18 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h b/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h
index b7da16ac3ddd..612c9f25a5a0 100644
--- a/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h
+++ b/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h
@@ -50,9 +50,6 @@ extern "C" {
 #ifndef DEBUG_LEVEL
 #define	DEBUG_LEVEL 0
 #endif
-#ifndef DEBUG_PARSE
-#define	DEBUG_PARSE 0
-#endif
 
 #ifndef DEBUG_STREAM
 #define	DEBUG_STREAM stderr
@@ -100,7 +97,6 @@ extern "C" {
 
 extern const char *progname;
 extern int debug_level;
-extern int debug_parse;
 extern char *curhdr;
 
 /*
@@ -405,18 +401,6 @@ void merge_into_master(tdata_t *, tdata_t *, tdata_t *, int);
 
 void write_ctf(tdata_t *, const char *, const char *, int);
 
-/* parse.c */
-void parse_init(tdata_t *);
-void parse_finish(tdata_t *);
-int parse_stab(stab_t *, char *, iidesc_t **);
-tdesc_t *lookup(int);
-tdesc_t *lookupname(const char *);
-void check_hash(void);
-void resolve_typed_bitfields(void);
-
-/* stabs.c */
-int stabs_read(tdata_t *, Elf *, char *);
-
 /* dwarf.c */
 int dw_read(tdata_t *, Elf *, char *);
 const char *dw_tag2str(uint_t);
@@ -445,8 +429,8 @@ int streq(const char *, const char *);
 int findelfsecidx(Elf *, const char *, const char *);
 size_t elf_ptrsz(Elf *);
 char *mktmpname(const char *, const char *);
-void terminate(const char *, ...) __NORETURN;
-void aborterr(const char *, ...) __NORETURN;
+void terminate(const char *, ...) __attribute__((noreturn));
+void aborterr(const char *, ...) __attribute__((noreturn));
 void set_terminate_cleanup(void (*)(void));
 void elfterminate(const char *, const char *, ...);
 void warning(const char *, ...);