error.c, md5.c, regex.c: Use '#if USE_UNLOCKED_IO' instead of

[gnulib.git] / lib / yesno.c

diff --git a/lib/yesno.c b/lib/yesno.c
index 0ad5511..54691b7 100644 (file)
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -1,5 +1,5 @@
 /* yesno.c -- read a yes/no response from stdin
-   Copyright (C) 1990, 1998, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 2001, 2003, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,10 +19,15 @@
 # include <config.h>
 #endif
 
+#include "yesno.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "unlocked-io.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 /* Read one line from standard input
    and return nonzero if that line begins with y or Y,
@@ -30,7 +35,7 @@
 
 extern int rpmatch (char const *response);
 
-int
+bool
 yesno (void)
 {
   /* We make some assumptions here: