From dd9da9bb957a42e6c9059a534154a0ea43e0e814 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Mon, 28 Apr 2025 16:00:32 +0200 Subject: [PATCH] sslecho: Rename bool to flag to avoid C23 conflict Fixes #27516 Reviewed-by: Matt Caswell Reviewed-by: Dmitry Belyavskiy (Merged from https://github.com/openssl/openssl/pull/27519) (cherry picked from commit 81ce3d3ae8f6c4021e0dce86891e869efa1710db) --- demos/sslecho/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/demos/sslecho/main.c b/demos/sslecho/main.c index 3114dcfcde7..b5c9e605e34 100644 --- a/demos/sslecho/main.c +++ b/demos/sslecho/main.c @@ -19,7 +19,7 @@ static const int server_port = 4433; -typedef unsigned char bool; +typedef unsigned char flag; #define true 1 #define false 0 @@ -27,9 +27,9 @@ typedef unsigned char bool; * This flag won't be useful until both accept/read (TCP & SSL) methods * can be called with a timeout. TBD. */ -static volatile bool server_running = true; +static volatile flag server_running = true; -int create_socket(bool isServer) +int create_socket(flag isServer) { int s; int optval = 1; @@ -67,7 +67,7 @@ int create_socket(bool isServer) return s; } -SSL_CTX* create_context(bool isServer) +SSL_CTX *create_context(flag isServer) { const SSL_METHOD *method; SSL_CTX *ctx; @@ -130,7 +130,7 @@ void usage(void) int main(int argc, char **argv) { - bool isServer; + flag isServer; int result; SSL_CTX *ssl_ctx = NULL; -- 2.47.2