summaryrefslogtreecommitdiff
path: root/usr/src/tools/ctf
diff options
context:
space:
mode:
authorKeith M Wesolowski <wesolows@foobazco.org>2014-11-13 16:00:42 +0000
committerKeith M Wesolowski <wesolows@foobazco.org>2014-11-13 16:00:42 +0000
commit15520107a042c1a5cd3911b9182ca6bd9e98b049 (patch)
tree7e548cd33416a04e2593528ecb0dbecc913da363 /usr/src/tools/ctf
parent48dc1fa56d7ebad2d3b3723b4841620262a1ff8d (diff)
parent5009f7885e2c6a7e13fe9ad876bd812add4754ef (diff)
downloadillumos-joyent-15520107a042c1a5cd3911b9182ca6bd9e98b049.tar.gz
[illumos-gate merge]
commit 5009f7885e2c6a7e13fe9ad876bd812add4754ef 5300 cleanup gcc warning for cmd/power commit e503abb729687d1a36b95ed2794f54452189c858 5278 cleanup gcc warnings for cmd/ps commit 2ecbc63a795e55973d5278384ecf60b2737798e1 5315 5234 misidentifies cases we need to replace representative lwp commit a6bde1a23b60f140c7ed78df979c2e22b1ed9b2c 3363 Mark non-returning functions in ctftools commit 85e6b6747d07050e01ec91acef2453655821f9ab 5308 Unable to join AD domain (with NtlmMinSeverSec set in the registry) commit fd75ca8de430ee0ba5ce650efee0ac0b85ed43e9 5307 AD join with lmauth_level=2 fails commit cb66c7814563eb32e20c1be88ae738ad8d63079d 5294 man ucred could do something useful Manifests: usr/src/pkg/manifests/system-library.man3c.inc
Diffstat (limited to 'usr/src/tools/ctf')
-rw-r--r--usr/src/tools/ctf/cvt/ctftools.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/tools/ctf/cvt/ctftools.h b/usr/src/tools/ctf/cvt/ctftools.h
index f586236ccf..fd9d454e06 100644
--- a/usr/src/tools/ctf/cvt/ctftools.h
+++ b/usr/src/tools/ctf/cvt/ctftools.h
@@ -37,6 +37,8 @@
#include <gelf.h>
#include <pthread.h>
+#include <sys/ccompile.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -443,8 +445,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(char *, ...);
-void aborterr(char *, ...);
+void terminate(char *, ...) __NORETURN;
+void aborterr(char *, ...) __NORETURN;
void set_terminate_cleanup(void (*)());
void elfterminate(const char *, const char *, ...);
void warning(char *, ...);