libopenbsd: clean up readpassphrase compat and fix ifdefs

[opendoas.git] / libopenbsd / readpassphrase.c

diff --git a/libopenbsd/readpassphrase.c b/libopenbsd/readpassphrase.c
index 6862a5e91d9c01dd2490a922db16ff943b504a43..87675aa4374a29e5176b82469ba9096f7d0079ef 100644 (file)
--- a/libopenbsd/readpassphrase.c
+++ b/libopenbsd/readpassphrase.c
@@ -23,7 +23,7 @@
 
 /* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */
 
-#include "includes.h"
+#include "config.h"
 
 #ifndef HAVE_READPASSPHRASE
 
@@ -31,10 +31,16 @@
 #include <signal.h>
 #include <ctype.h>
 #include <fcntl.h>
-#include <readpassphrase.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
+#include <paths.h>
+
+#include "sys-readpassphrase.h"
+
+#ifndef _PATH_TTY
+#define _PATH_TTY "/dev/tty"
+#endif
 
 #ifndef TCSASOFT
 /* If we don't have TCSASOFT define it so that ORing it it below is a no-op. */