Replace usage of EM_BOOL with C/C++ bool type. NFC

ChangeLog.md

@@ -20,6 +20,9 @@ See docs/process.md for more on how version tagging works.
 
 3.1.69 (in development)
 -----------------------
+- The usage of `EM_BOOL` in the emscripten API has been replaced with C/C++
+  bool.  This change should not be observable since `EM_BOOL` has been
+  equivalent to `bool` since #22157. (#22155)
 
 3.1.68 - 09/30/24
 -----------------

site/source/docs/api_reference/wasm_audio_worklets.rst

@@ -95,7 +95,7 @@ own noise generator AudioWorkletProcessor node type:
 
 .. code-block:: cpp
 
-  void AudioThreadInitialized(EMSCRIPTEN_WEBAUDIO_T audioContext, EM_BOOL success, void *userData)
+  void AudioThreadInitialized(EMSCRIPTEN_WEBAUDIO_T audioContext, bool success, void *userData)
   {
     if (!success) return; // Check browser console in a debug build for detailed errors
     WebAudioWorkletProcessorCreateOptions opts = {
@@ -110,7 +110,7 @@ which resumes the audio context when the user clicks on the DOM Canvas element t
 
 .. code-block:: cpp
 
-  void AudioWorkletProcessorCreated(EMSCRIPTEN_WEBAUDIO_T audioContext, EM_BOOL success, void *userData)
+  void AudioWorkletProcessorCreated(EMSCRIPTEN_WEBAUDIO_T audioContext, bool success, void *userData)
   {
     if (!success) return; // Check browser console in a debug build for detailed errors
 
@@ -137,13 +137,13 @@ which resumes the audio context when the user clicks on the DOM Canvas element t
 
 .. code-block:: cpp
 
-  EM_BOOL OnCanvasClick(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData)
+  bool OnCanvasClick(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData)
   {
     EMSCRIPTEN_WEBAUDIO_T audioContext = (EMSCRIPTEN_WEBAUDIO_T)userData;
     if (emscripten_audio_context_state(audioContext) != AUDIO_CONTEXT_STATE_RUNNING) {
       emscripten_resume_audio_context_sync(audioContext);
     }
-    return EM_FALSE;
+    return false;
   }
 
 5. Finally we can implement the audio callback that is to generate the noise:
@@ -152,7 +152,7 @@ which resumes the audio context when the user clicks on the DOM Canvas element t
 
   #include <emscripten/em_math.h>
 
-  EM_BOOL GenerateNoise(int numInputs, const AudioSampleFrame *inputs,
+  bool GenerateNoise(int numInputs, const AudioSampleFrame *inputs,
                         int numOutputs, AudioSampleFrame *outputs,
                         int numParams, const AudioParamFrame *params,
                         void *userData)
@@ -161,7 +161,7 @@ which resumes the audio context when the user clicks on the DOM Canvas element t
       for(int j = 0; j < 128*outputs[i].numberOfChannels; ++j)
         outputs[i].data[j] = emscripten_random() * 0.2 - 0.1; // Warning: scale down audio volume by factor of 0.2, raw noise can be really loud otherwise
 
-    return EM_TRUE; // Keep the graph output going
+    return true; // Keep the graph output going
   }
 
 And that's it! Compile the code with the linker flags ``-sAUDIO_WORKLET=1 -sWASM_WORKERS=1`` to enable targeting AudioWorklets.

site/source/docs/porting/emscripten-runtime-environment.rst

@@ -73,11 +73,11 @@ Typically you will have a small section with ``#ifdef __EMSCRIPTEN__`` for the t
   // Our "main loop" function. This callback receives the current time as
   // reported by the browser, and the user data we provide in the call to
   // emscripten_request_animation_frame_loop().
-  EM_BOOL one_iter(double time, void* userData) {
+  bool one_iter(double time, void* userData) {
     // Can render to the screen here, etc.
     puts("one iteration");
     // Return true to keep the loop running.
-    return EM_TRUE;
+    return true;
   }
 
   int main() {

system/include/emscripten/em_types.h

@@ -5,6 +5,8 @@
  * found in the LICENSE file.
  */
 
+#include <stdbool.h>
+
 #pragma once
 
 #include <stdbool.h>
@@ -31,9 +33,11 @@ typedef void (*em_callback_func)(void);
 typedef void (*em_arg_callback_func)(void*);
 typedef void (*em_str_callback_func)(const char *);
 
+/* Legacy EM_BOOL type. Emscripten no longer uses this */
 #define EM_BOOL bool
-#define EM_TRUE 1
-#define EM_FALSE 0
+#define EM_TRUE true
+#define EM_FALSE false
+
 #define EM_UTF8 char
 
 #define EMSCRIPTEN_RESULT int

system/include/emscripten/eventloop.h

@@ -17,18 +17,18 @@ void emscripten_unwind_to_js_event_loop(void) __attribute__((__noreturn__));
 
 int emscripten_set_timeout(void (*cb)(void *user_data) __attribute__((nonnull)), double msecs, void *user_data);
 void emscripten_clear_timeout(int id);
-void emscripten_set_timeout_loop(EM_BOOL (*cb)(double time, void *user_data) __attribute__((nonnull)), double interval_ms, void *user_data);
+void emscripten_set_timeout_loop(bool (*cb)(double time, void *user_data) __attribute__((nonnull)), double interval_ms, void *user_data);
 
 int emscripten_set_immediate(void (*cb)(void *user_data) __attribute__((nonnull)), void *user_data);
 void emscripten_clear_immediate(int id);
-void emscripten_set_immediate_loop(EM_BOOL (*cb)(void *user_data), void *user_data);
+void emscripten_set_immediate_loop(bool (*cb)(void *user_data), void *user_data);
 
 int emscripten_set_interval(void (*cb)(void *user_data) __attribute__((nonnull)), double interval_ms, void *user_data);
 void emscripten_clear_interval(int id);
 
 void emscripten_runtime_keepalive_push(void);
 void emscripten_runtime_keepalive_pop(void);
-EM_BOOL emscripten_runtime_keepalive_check(void);
+bool emscripten_runtime_keepalive_check(void);
 
 #ifdef __cplusplus
 }

system/include/emscripten/fetch.h

@@ -8,9 +8,10 @@
 #pragma once
 
 #include <limits.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <emscripten/html5.h>
+#include <emscripten/em_types.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -88,7 +89,7 @@ typedef struct emscripten_fetch_attr_t {
 
   // Indicates whether cross-site access control requests should be made using
   // credentials.
-  EM_BOOL withCredentials;
+  bool withCredentials;
 
   // Specifies the destination path in IndexedDB where to store the downloaded
   // content body. If this is empty, the transfer is not stored to IndexedDB at