libopenbsd: define __dead as noreturn

[opendoas.git] / libopenbsd / openbsd.h

diff --git a/libopenbsd/openbsd.h b/libopenbsd/openbsd.h
index f0eec3df135b1ec03efe1621670bd2f72fe57fd2..da420de7fdd63832973f891cc053ab2cd706b178 100644 (file)
--- a/libopenbsd/openbsd.h
+++ b/libopenbsd/openbsd.h
@@ -3,28 +3,16 @@
 
 #include <stdarg.h>
 #include <sys/types.h>
-#include <sys/cdefs.h>
 
-#include "readpassphrase.h"
-
-/* API definitions lifted from OpenBSD src/include */
+#ifndef __UNUSED
+# define __UNUSED __attribute__ ((unused))
+#endif
 
-/* login_cap.h */
-#ifndef HAVE_LOGIN_CAP_H
-#define        LOGIN_SETGROUP          0x0001  /* Set group */
-#define        LOGIN_SETLOGIN          0x0002  /* Set login */
-#define        LOGIN_SETPATH           0x0004  /* Set path */
-#define        LOGIN_SETPRIORITY       0x0008  /* Set priority */
-#define        LOGIN_SETRESOURCES      0x0010  /* Set resource limits */
-#define        LOGIN_SETUMASK          0x0020  /* Set umask */
-#define        LOGIN_SETUSER           0x0040  /* Set user */
-#define        LOGIN_SETENV            0x0080  /* Set environment */
-#define        LOGIN_SETALL            0x00ff  /* Set all. */
+#ifndef __dead
+# define __dead __attribute__ ((noreturn))
+#endif
 
-typedef struct login_cap login_cap_t;
-struct passwd;
-int setusercontext(login_cap_t *, struct passwd *, uid_t, unsigned int);
-#endif /* !HAVE_LOGIN_CAP_H */
+/* API definitions lifted from OpenBSD src/include */
 
 /* pwd.h */
 #define _PW_NAME_LEN 63
@@ -59,13 +47,16 @@ int setresuid(uid_t, uid_t, uid_t);
 #ifndef HAVE_PLEDGE
 int pledge(const char *promises, const char *paths[]);
 #endif /* !HAVE_PLEDGE */
+#ifndef HAVE_CLOSEFROM
+void closefrom(int);
+#endif /* !HAVE_CLOSEFROM */
 
 /* err.h */
 #ifndef HAVE_VERRC
-void verrc(int eval, int code, const char *fmt, va_list ap);
+void __dead verrc(int eval, int code, const char *fmt, va_list ap);
 #endif /* !HAVE_VERRC */
 #ifndef HAVE_ERRC
-void errc(int eval, int code, const char *fmt, ...);
+__dead void errc(int eval, int code, const char *fmt, ...);
 #endif /* !HAVE_ERRC */
 
 #ifndef HAVE_SETPROGNAME