Merge branch 'legacy_63'

[~andy/fetchmail] / getpass.c

diff --git a/getpass.c b/getpass.c
index c3e9723e96130f34c3c20a886b3c3b3a642fe633..c1624299eb43d75a494420ce7694c83aa0f93903 100644 (file)
--- a/getpass.c
+++ b/getpass.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "fetchmail.h"
-#include "i18n.h"
+#include "gettext.h"
 
 #define INPUT_BUF_SIZE PASSWORDLEN
 
@@ -34,7 +34,7 @@ static tcflag_t flags;
 static void save_tty_state(void);
 static void disable_tty_echo(void);
 static void restore_tty_state(void);
-static RETSIGTYPE sigint_handler(int);
+static void sigint_handler(int);
 
 char *fm_getpassword(char *prompt)
 {
@@ -121,7 +121,7 @@ static void restore_tty_state(void)
     tcsetattr(ttyfd, TCSAFLUSH, &termb);
 }
 
-static RETSIGTYPE sigint_handler(int signum)
+static void sigint_handler(int signum)
 {
     (void)signum;
     restore_tty_state();