From ab6447fbf1157bdce183cd4af40f93093fda271d Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Fri, 6 Jan 2023 11:44:59 +0200
Subject: Use stdbool.h

Fixes issues like:

    model-info.c:305:1: error: conflicting types for 'model_info_customise_commands'; have '_Bool(const void *, struct <anonymous> *)'
      305 | model_info_customise_commands (const void *self, EpsonCmd cmd)
          | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    In file included from model-info.c:69:
    model-info.h:135:8: note: previous declaration of 'model_info_customise_commands' with type 'bool(const void *, struct <anonymous> *)'
      135 |   bool model_info_customise_commands (const void *self, EpsonCmd cmd);
          |        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---
 backend/cfg-obj.h    |  1 +
 backend/defines.h    | 11 +----------
 backend/model-info.c |  4 ++--
 backend/model-info.h |  1 +
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/backend/cfg-obj.h b/backend/cfg-obj.h
index 1e414fa..461a6ec 100644
--- a/backend/cfg-obj.h
+++ b/backend/cfg-obj.h
@@ -70,6 +70,7 @@
 #endif
 
 #include <stdint.h>
+#include <stdbool.h>
 
 #include <sane/sane.h>
 
diff --git a/backend/defines.h b/backend/defines.h
index 9940b7b..fa634e5 100644
--- a/backend/defines.h
+++ b/backend/defines.h
@@ -30,19 +30,10 @@ extern "C"
 #define MM_PER_INCH     25.4    /* exactly */
 
 
-#ifndef __cplusplus
-/*! A C++ Boolean type and corresponding keywords for our C code.
- */
-typedef enum {
-  false = 0,
-  true
-} bool;
-#endif
-
-
 /*  Run-time contract validation.
  */
 #include <stdlib.h>
+#include <stdbool.h>
 #include "message.h"
 
 #define _assert(type,condition)                                 \
diff --git a/backend/model-info.c b/backend/model-info.c
index 5423483..7ef0c68 100644
--- a/backend/model-info.c
+++ b/backend/model-info.c
@@ -677,12 +677,12 @@ model_info_has_lock_commands (const void *self)
   return (self_->command->lock && self_->command->unlock);
 }
 
-scan_area_t 
+scan_area_t
 model_info_max_scan_area(const void *self, const char *option, const char *mode)
 {
   _model_info_t *self_ = NULL;
   scan_area_t scan_area;
-  
+
   require (self);
   require (option);
 
diff --git a/backend/model-info.h b/backend/model-info.h
index b92defb..349e807 100644
--- a/backend/model-info.h
+++ b/backend/model-info.h
@@ -100,6 +100,7 @@
  *  SANE_Device structure marginally less verbose.
  */
 
+#include <stdbool.h>
 #include <sane/sane.h>
 
 #include "defines.h"
-- 
cgit v1.2.3