From 2ced9c504a5db56862711a8b55430a4c5e94b86a Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwin.coumans@gmail.com>
Date: Wed, 11 Dec 2019 14:04:55 -0800
Subject: [PATCH] make it a one-liner, so clang-cl doesn't fail on Windows

---
 src/Bullet3Common/b3Logging.h | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/Bullet3Common/b3Logging.h b/src/Bullet3Common/b3Logging.h
index 3542718d6..f61149de7 100644
--- a/src/Bullet3Common/b3Logging.h
+++ b/src/Bullet3Common/b3Logging.h
@@ -14,33 +14,8 @@ extern "C"
 	//#define b3Printf b3OutputPrintfVarArgsInternal
 	//#define b3Printf(...) printf(__VA_ARGS__)
 	//#define b3Printf(...)
-#ifdef __clang__
-#define b3Warning(...)                                                                    \
-	do                                                                                    \
-	{                                                                                     \
-		b3OutputWarningMessageVarArgsInternal("b3Warning[%s,%d]:\n", __FILE_NAME__, __LINE__); \
-		b3OutputWarningMessageVarArgsInternal(__VA_ARGS__);                               \
-	} while (0)
-#define b3Error(...)                                                                  \
-	do                                                                                \
-	{                                                                                 \
-		b3OutputErrorMessageVarArgsInternal("b3Error[%s,%d]:\n", __FILE_NAME__, __LINE__); \
-		b3OutputErrorMessageVarArgsInternal(__VA_ARGS__);                             \
-	} while (0)
-#else//__clang__
-#define b3Warning(...)                                                                    \
-	do                                                                                    \
-	{                                                                                     \
-		b3OutputWarningMessageVarArgsInternal("b3Warning[%s,%d]:\n", __FILE__, __LINE__); \
-		b3OutputWarningMessageVarArgsInternal(__VA_ARGS__);                               \
-	} while (0)
-#define b3Error(...)                                                                  \
-	do                                                                                \
-	{                                                                                 \
-		b3OutputErrorMessageVarArgsInternal("b3Error[%s,%d]:\n", __FILE__, __LINE__); \
-		b3OutputErrorMessageVarArgsInternal(__VA_ARGS__);                             \
-	} while (0)
-#endif //__clang__
+#define b3Warning(...) do{	b3OutputWarningMessageVarArgsInternal("b3Warning[%s,%d]:\n", __FILE__, __LINE__);b3OutputWarningMessageVarArgsInternal(__VA_ARGS__);} while (0)
+#define b3Error(...)do	{b3OutputErrorMessageVarArgsInternal("b3Error[%s,%d]:\n", __FILE__, __LINE__);b3OutputErrorMessageVarArgsInternal(__VA_ARGS__);} while (0)
 #ifndef B3_NO_PROFILE
 
 	void b3EnterProfileZone(const char* name);