From 096438ae2f68605b268f80a027a1880fcaf300f3 Mon Sep 17 00:00:00 2001
From: "R. Bernstein" <rocky@gnu.org>
Date: Sun, 23 Sep 2012 21:43:42 -0400
Subject: Try again for more consistent use of booleans. WARNING libiso9660 is
 broke. Last known good commit is 6137ddb73763bcdc524f65dde2048bc639695dc4.

---
 lib/iso9660/iso9660_fs.c      | 4 ++++
 lib/iso9660/iso9660_private.h | 4 ++++
 lib/udf/udf_private.h         | 4 ++++
 src/cdda-player.c             | 5 ++---
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/iso9660/iso9660_fs.c b/lib/iso9660/iso9660_fs.c
index 8ef2be43..3eb06b57 100644
--- a/lib/iso9660/iso9660_fs.c
+++ b/lib/iso9660/iso9660_fs.c
@@ -23,6 +23,10 @@
 #define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
diff --git a/lib/iso9660/iso9660_private.h b/lib/iso9660/iso9660_private.h
index e798ec75..d891b060 100644
--- a/lib/iso9660/iso9660_private.h
+++ b/lib/iso9660/iso9660_private.h
@@ -30,6 +30,10 @@
 # define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/types.h>
 
 #define ISO_VERSION             1
diff --git a/lib/udf/udf_private.h b/lib/udf/udf_private.h
index d61cc911..d958ec85 100644
--- a/lib/udf/udf_private.h
+++ b/lib/udf/udf_private.h
@@ -23,6 +23,10 @@
 # define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/types.h>
 #include <cdio/ecma_167.h>
 #include <cdio/udf.h>
diff --git a/src/cdda-player.c b/src/cdda-player.c
index f3ae0ce0..c7c1af15 100644
--- a/src/cdda-player.c
+++ b/src/cdda-player.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2008, 2009, 2010, 2011
+  Copyright (C) 2005, 2006, 2008, 2009, 2010, 2011, 2012
   Rocky Bernstein <rocky@gnu.org>
 
   Adapted from Gerd Knorr's player.c program  <kraxel@bytesex.org>
@@ -964,13 +964,12 @@ print_keys()
 static void 
 keypress_wait(CdIo_t *p_cdio)
   {
-    int key;
     action("press any key to continue");
     while (1 != select_wait(b_cd ? 1 : 5)) {
       read_subchannel(p_cdio);
       display_status(true);
     }
-    key = getch();
+    (void) getch();
     clrtobot();
     action(NULL);
     if (!b_all_tracks)
-- 
cgit v1.2.3