From b7d2f6079f63e52460b4b0723600b6de86baa830 Mon Sep 17 00:00:00 2001
From: Aadi Desai <21363892+supleed2@users.noreply.github.com>
Date: Fri, 12 May 2023 17:28:23 +0100
Subject: [PATCH] Remove WITH_CXX ifdefs, always compiles as C++

---
 demo/main.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/demo/main.c b/demo/main.c
index 1126800..6497a07 100644
--- a/demo/main.c
+++ b/demo/main.c
@@ -86,7 +86,6 @@ static void help(void) {
 #endif
 	puts("donut              - Spinning Donut demo");
 	puts("helloc             - Hello C");
-#ifdef WITH_CXX
 	puts("hellocpp           - Hello C++");
 #ifdef CSR_LEDS_BASE
 	puts("leds               - Led set demo");
@@ -94,7 +93,6 @@ static void help(void) {
 #ifdef CSR_AUDIO_BASE
 	puts("audio              - Sawtooth Audio demo");
 #endif
-#endif
 }
 
 /*-----------------------------------------------------------------------*/
@@ -145,7 +143,6 @@ static void led_cmd(void) {
 }
 #endif
 
-#ifdef WITH_CXX
 #ifdef CSR_LEDS_BASE
 extern void leds(int);
 
@@ -164,7 +161,6 @@ static void audio_cmd(char **val) {
 	audio(value);
 }
 #endif
-#endif
 
 extern void donut(void);
 
@@ -180,14 +176,12 @@ static void helloc_cmd(void) {
 	helloc();
 }
 
-#ifdef WITH_CXX
 extern void hellocpp(void);
 
 static void hellocpp_cmd(void) {
 	printf("Hello C++ demo...\n");
 	hellocpp();
 }
-#endif
 
 /*-----------------------------------------------------------------------*/
 /* Console service / Main                                                */
@@ -213,7 +207,6 @@ static void console_service(void) {
 		donut_cmd();
 	else if (strcmp(token, "helloc") == 0)
 		helloc_cmd();
-#ifdef WITH_CXX
 	else if (strcmp(token, "hellocpp") == 0)
 		hellocpp_cmd();
 #ifdef CSR_LEDS_BASE
@@ -223,7 +216,6 @@ static void console_service(void) {
 #ifdef CSR_AUDIO_BASE
 	else if (strcmp(token, "audio") == 0)
 		audio_cmd(&str);
-#endif
 #endif
 	prompt();
 }