Make sure stdbool is used in driver when it is defined. I think this fixes bug #37394

10 files changed, 43 insertions, 5 deletions

diff --git a/lib/driver/MSWindows/win32_ioctl.c b/lib/driver/MSWindows/win32_ioctl.c
index d4064318..813e3b89 100755
--- a/lib/driver/MSWindows/win32_ioctl.c
+++ b/lib/driver/MSWindows/win32_ioctl.c
@@ -468,6 +468,7 @@ run_mmc_cmd_win32ioctl( void *p_user_data,
   char dummy_buf[2]; /* Used if we can't use p_buf. See below. */
   int rc = DRIVER_OP_SUCCESS;
 
+  p_env->gen.scsi_mmc_sense_valid = 0;
   memset(&swb, 0, sizeof(swb));
   
   swb.sptd.Length  = sizeof(SCSI_PASS_THROUGH_DIRECT);
@@ -561,6 +562,7 @@ run_mmc_cmd_win32ioctl( void *p_user_data,
   unsigned long length = 0;
   DWORD dw_bytes_returned;
 
+  p_env->gen.scsi_mmc_sense_valid = 0;
   memset(&sptwb, 0, sizeof(sptwb));
   
   sptwb.Spt.Length  = sizeof(sptwb.Spt);
diff --git a/lib/driver/device.c b/lib/driver/device.c
index 8df6db09..73b46ab2 100644
--- a/lib/driver/device.c
+++ b/lib/driver/device.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2005, 2006, 2008, 2011
+  Copyright (C) 2005, 2006, 2008, 2011, 2012
   Rocky Bernstein <rocky@gnu.org>
 
   This program is free software: you can redistribute it and/or modify
@@ -23,6 +23,10 @@
 # define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/cdio.h>
 #include <cdio/cd_types.h>
 #include <cdio/logging.h>
diff --git a/lib/driver/disc.c b/lib/driver/disc.c
index ec09ad10..02adb327 100644
--- a/lib/driver/disc.c
+++ b/lib/driver/disc.c
@@ -23,6 +23,10 @@
 # define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/cdio.h>
 #include "cdio_private.h"
 
diff --git a/lib/driver/generic.h b/lib/driver/generic.h
index 1f435d61..407b1866 100644
--- a/lib/driver/generic.h
+++ b/lib/driver/generic.h
@@ -30,6 +30,10 @@
 #include <cdio/cdtext.h>
 #include <cdio/iso9660.h>
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
diff --git a/lib/driver/image.h b/lib/driver/image.h
index 1db3a99f..f295134b 100644
--- a/lib/driver/image.h
+++ b/lib/driver/image.h
@@ -30,6 +30,10 @@
 # define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/types.h>
 #include <cdio/cdtext.h>
 #include "cdio_private.h"
diff --git a/lib/driver/image/nrg.c b/lib/driver/image/nrg.c
index c36d4aeb..c9ef6cff 100644
--- a/lib/driver/image/nrg.c
+++ b/lib/driver/image/nrg.c
@@ -37,6 +37,9 @@
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
 #endif
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
 
 #include <cdio/bytesex.h>
 #include <cdio/ds.h>
diff --git a/lib/driver/mmc/mmc.c b/lib/driver/mmc/mmc.c
index 236c8347..1e078798 100644
--- a/lib/driver/mmc/mmc.c
+++ b/lib/driver/mmc/mmc.c
@@ -20,6 +20,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/cdio.h>
 #include <cdio/logging.h>
 #include <cdio/mmc.h>
@@ -37,13 +41,14 @@
 #endif
 
 #ifdef HAVE_STDIO_H
-#include <stdio.h>
+# include <stdio.h>
 #endif
 
 #ifdef HAVE_ERRNO_H
-#include <errno.h>
+# include <errno.h>
 #endif
 
+
 /*************************************************************************
   MMC CdIo Operations which a driver may use. 
   These are not accessible directly.
diff --git a/lib/driver/mmc/mmc_ll_cmds.c b/lib/driver/mmc/mmc_ll_cmds.c
index e94dcd86..72fd8ee0 100644
--- a/lib/driver/mmc/mmc_ll_cmds.c
+++ b/lib/driver/mmc/mmc_ll_cmds.c
@@ -2,7 +2,7 @@
    Wrappers for specific Multimedia Command (MMC) commands e.g., READ
    DISC, START/STOP UNIT.
    
-   Copyright (C) 2010, 2011 Rocky Bernstein <rocky@gnu.org>
+   Copyright (C) 2010-2012 Rocky Bernstein <rocky@gnu.org>
 
    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
@@ -23,6 +23,10 @@
 # define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/cdio.h>
 #include <cdio/mmc_ll_cmds.h>
 #include "cdio_private.h"
diff --git a/lib/driver/read.c b/lib/driver/read.c
index fd7134e0..da3faea1 100644
--- a/lib/driver/read.c
+++ b/lib/driver/read.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2005, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2008, 2011, 2012 Rocky Bernstein <rocky@gnu.org>
 
   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
@@ -25,6 +25,10 @@
 # define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/cdio.h>
 #include <cdio/logging.h>
 #include "cdio_private.h"
diff --git a/lib/driver/track.c b/lib/driver/track.c
index da03d93f..b4953fd2 100644
--- a/lib/driver/track.c
+++ b/lib/driver/track.c
@@ -23,6 +23,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/cdio.h>
 #include <cdio/logging.h>
 #include "cdio_private.h"