i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More "missing space after macro; invalid in C++11" error fixes.

Browse Source
This commit is contained in:
Augustin Cavalier
2017-12-12 20:08:26 -05:00
parent 36f28382db
commit 361f980f9d
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/graphics/common/debug_ext.h
+11 -11
View File
@@ -3,7 +3,7 @@
Part of Radeon driver Part of Radeon driver
Extended debugging functions Extended debugging functions
*/ */
@@ -18,7 +18,7 @@
// info: tells things that are important but not an error // info: tells things that are important but not an error
// error: used if something has gone wrong // 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}( seriousness, format string, parameters... );
// SHOW_{FLOW,INFO,ERROR}0( seriousness, string ); // SHOW_{FLOW,INFO,ERROR}0( seriousness, string );
// //
@@ -29,7 +29,7 @@
// to specify the module that created the message you have // to specify the module that created the message you have
// to define a string called // to define a string called
// DEBUG_MSG_PREFIX // 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 // the following variables/macros
// debug_level_flow // debug_level_flow
// debug_level_info // debug_level_info
@@ -40,7 +40,7 @@
// DEBUG_MAX_LEVEL_INFO // DEBUG_MAX_LEVEL_INFO
// DEBUG_MAX_LEVEL_ERRROR // 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 // by defining the duration (in ms) via
// DEBUG_WAIT_ON_MSG (for flow and info) // DEBUG_WAIT_ON_MSG (for flow and info)
// DEBUG_WAIT_ON_ERROR (for error) // DEBUG_WAIT_ON_ERROR (for error)
@@ -48,7 +48,7 @@
#ifdef DEBUG_WAIT_ON_MSG #ifdef DEBUG_WAIT_ON_MSG
#define DEBUG_WAIT snooze( DEBUG_WAIT_ON_MSG ); #define DEBUG_WAIT snooze( DEBUG_WAIT_ON_MSG );
#else #else
#define DEBUG_WAIT #define DEBUG_WAIT
#endif #endif
#ifdef DEBUG_WAIT_ON_ERROR #ifdef DEBUG_WAIT_ON_ERROR
@@ -77,32 +77,32 @@
#define SHOW_FLOW(seriousness, format, param...) \ #define SHOW_FLOW(seriousness, format, param...) \
do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ 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 ) }} while( 0 )
#define SHOW_FLOW0(seriousness, format) \ #define SHOW_FLOW0(seriousness, format) \
do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ 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 ) }} while( 0 )
#define SHOW_INFO(seriousness, format, param...) \ #define SHOW_INFO(seriousness, format, param...) \
do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ 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 ) }} while( 0 )
#define SHOW_INFO0(seriousness, format) \ #define SHOW_INFO0(seriousness, format) \
do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ 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 ) }} while( 0 )
#define SHOW_ERROR(seriousness, format, param...) \ #define SHOW_ERROR(seriousness, format, param...) \
do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ 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 ) }} while( 0 )
#define SHOW_ERROR0(seriousness, format) \ #define SHOW_ERROR0(seriousness, format) \
do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ 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 ) }} while( 0 )
#endif #endif
src/add-ons/media/plugins/ffmpeg/gfx_util.cpp
+5 -5
View File
@@ -23,7 +23,7 @@ extern "C" {
#endif #endif
#if LIBAVCODEC_VERSION_INT < ((54 << 16) | (50 << 8)) #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_NONE PIX_FMT_NONE
#define AV_PIX_FMT_YUV410P PIX_FMT_YUV410P #define AV_PIX_FMT_YUV410P PIX_FMT_YUV410P
#define AV_PIX_FMT_YUV411P PIX_FMT_YUV411P #define AV_PIX_FMT_YUV411P PIX_FMT_YUV411P
@@ -291,8 +291,8 @@ colorspace_to_pixfmt(color_space format)
void void
dump_ffframe_audio(AVFrame* frame, const char* name) dump_ffframe_audio(AVFrame* frame, const char* name)
{ {
printf(BEGIN_TAG"AVFrame(%s) [ pkt_dts:%-10lld #samples:%-5d %s" printf(BEGIN_TAG "AVFrame(%s) [ pkt_dts:%-10lld #samples:%-5d %s"
" ]\n"END_TAG, " ]\n" END_TAG,
name, name,
frame->pkt_dts, frame->pkt_dts,
frame->nb_samples, frame->nb_samples,
@@ -305,8 +305,8 @@ dump_ffframe_video(AVFrame* frame, const char* name)
{ {
const char* picttypes[] = {"no pict type", "intra", "predicted", const char* picttypes[] = {"no pict type", "intra", "predicted",
"bidir pre", "s(gmc)-vop"}; "bidir pre", "s(gmc)-vop"};
printf(BEGIN_TAG"AVFrame(%s) [ pkt_dts:%-10lld cnum:%-5d dnum:%-5d %s%s" printf(BEGIN_TAG "AVFrame(%s) [ pkt_dts:%-10lld cnum:%-5d dnum:%-5d %s%s"
" ]\n"END_TAG, " ]\n" END_TAG,
name, name,
frame->pkt_dts, frame->pkt_dts,
frame->coded_picture_number, frame->coded_picture_number,