From 361f980f9dae7ee67259c22d09495dfc8ed3b574 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Tue, 12 Dec 2017 20:08:26 -0500
Subject: [PATCH] More "missing space after macro; invalid in C++11" error
 fixes.

---
 headers/private/graphics/common/debug_ext.h   | 22 +++++++++++-----------
 src/add-ons/media/plugins/ffmpeg/gfx_util.cpp | 10 +++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/headers/private/graphics/common/debug_ext.h b/headers/private/graphics/common/debug_ext.h
index c15ce313fc..9ac65abc55 100644
--- a/headers/private/graphics/common/debug_ext.h
+++ b/headers/private/graphics/common/debug_ext.h
@@ -3,7 +3,7 @@
 
 
 	Part of Radeon driver
-		
+
 	Extended debugging functions
 */
 
@@ -18,7 +18,7 @@
 //  info: tells things that are important but not an error
 //  error: used if something has gone wrong
 //
-// common usage is 
+// common usage is
 //  SHOW_{FLOW,INFO,ERROR}( seriousness, format string, parameters... );
 //  SHOW_{FLOW,INFO,ERROR}0( seriousness, string );
 //
@@ -29,7 +29,7 @@
 // to specify the module that created the message you have
 // to define a string called
 //  DEBUG_MSG_PREFIX
-// you dynamically speficify the maximum seriousness level by defining 
+// you dynamically speficify the maximum seriousness level by defining
 // the following variables/macros
 //  debug_level_flow
 //  debug_level_info
@@ -40,7 +40,7 @@
 //  DEBUG_MAX_LEVEL_INFO
 //  DEBUG_MAX_LEVEL_ERRROR
 //
-// you _can_ ask to delay execution after each printed message 
+// you _can_ ask to delay execution after each printed message
 // by defining the duration (in ms) via
 //  DEBUG_WAIT_ON_MSG (for flow and info)
 //  DEBUG_WAIT_ON_ERROR (for error)
@@ -48,7 +48,7 @@
 #ifdef DEBUG_WAIT_ON_MSG
 #define DEBUG_WAIT snooze( DEBUG_WAIT_ON_MSG );
 #else
-#define DEBUG_WAIT 
+#define DEBUG_WAIT
 #endif
 
 #ifdef DEBUG_WAIT_ON_ERROR
@@ -77,32 +77,32 @@
 
 #define SHOW_FLOW(seriousness, format, param...) \
 	do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \
+		dprintf( "%s%s: " format "\n", FUNC_NAME, param ); DEBUG_WAIT \
 	}} while( 0 )
 
 #define SHOW_FLOW0(seriousness, format) \
 	do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \
+		dprintf( "%s%s: " format "\n", FUNC_NAME); DEBUG_WAIT \
 	}} while( 0 )
 
 #define SHOW_INFO(seriousness, format, param...) \
 	do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \
+		dprintf( "%s%s: " format "\n", FUNC_NAME, param ); DEBUG_WAIT \
 	}} while( 0 )
 
 #define SHOW_INFO0(seriousness, format) \
 	do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \
+		dprintf( "%s%s: " format "\n", FUNC_NAME); DEBUG_WAIT \
 	}} while( 0 )
 
 #define SHOW_ERROR(seriousness, format, param...) \
 	do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \
+		dprintf( "%s%s: " format "\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \
 	}} while( 0 )
 
 #define SHOW_ERROR0(seriousness, format) \
 	do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \
+		dprintf( "%s%s: " format "\n", FUNC_NAME); DEBUG_WAIT_ERROR \
 	}} while( 0 )
 
 #endif
diff --git a/src/add-ons/media/plugins/ffmpeg/gfx_util.cpp b/src/add-ons/media/plugins/ffmpeg/gfx_util.cpp
index bb83dc8f13..f20c61c251 100644
--- a/src/add-ons/media/plugins/ffmpeg/gfx_util.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/gfx_util.cpp
@@ -23,7 +23,7 @@ extern "C" {
 #endif
 
 #if LIBAVCODEC_VERSION_INT < ((54 << 16) | (50 << 8))
-#define AVPixelFormat PixelFormat 
+#define AVPixelFormat PixelFormat
 #define AV_PIX_FMT_NONE PIX_FMT_NONE
 #define AV_PIX_FMT_YUV410P PIX_FMT_YUV410P
 #define AV_PIX_FMT_YUV411P PIX_FMT_YUV411P
@@ -291,8 +291,8 @@ colorspace_to_pixfmt(color_space format)
 void
 dump_ffframe_audio(AVFrame* frame, const char* name)
 {
-	printf(BEGIN_TAG"AVFrame(%s) [ pkt_dts:%-10lld #samples:%-5d %s"
-		" ]\n"END_TAG,
+	printf(BEGIN_TAG "AVFrame(%s) [ pkt_dts:%-10lld #samples:%-5d %s"
+		" ]\n" END_TAG,
 		name,
 		frame->pkt_dts,
 		frame->nb_samples,
@@ -305,8 +305,8 @@ dump_ffframe_video(AVFrame* frame, const char* name)
 {
 	const char* picttypes[] = {"no pict type", "intra", "predicted",
 		"bidir pre", "s(gmc)-vop"};
-	printf(BEGIN_TAG"AVFrame(%s) [ pkt_dts:%-10lld cnum:%-5d dnum:%-5d %s%s"
-		" ]\n"END_TAG,
+	printf(BEGIN_TAG "AVFrame(%s) [ pkt_dts:%-10lld cnum:%-5d dnum:%-5d %s%s"
+		" ]\n" END_TAG,
 		name,
 		frame->pkt_dts,
 		frame->coded_picture_number,
-- 
2.11.4.GIT