[Scummvm-git-logs] scummvm master -> 42f3fb2e93d6d2a66d4883f1a85342b72f58d391

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
42f3fb2e93 GRAPHICS: Fix GCC Compiler Duplicated Branch Warnings in Nano SVG


Commit: 42f3fb2e93d6d2a66d4883f1a85342b72f58d391
    https://github.com/scummvm/scummvm/commit/42f3fb2e93d6d2a66d4883f1a85342b72f58d391
Author: D G Turner (digitall at scummvm.org)
Date: 2022-01-12T04:59:23Z

Commit Message:
GRAPHICS: Fix GCC Compiler Duplicated Branch Warnings in Nano SVG

These are emitted if the build is compiled with -Wduplicated-branches.

Changed paths:
    graphics/nanosvg/nanosvg.h


diff --git a/graphics/nanosvg/nanosvg.h b/graphics/nanosvg/nanosvg.h
index 9891fc627c4..2d506e468dc 100644
--- a/graphics/nanosvg/nanosvg.h
+++ b/graphics/nanosvg/nanosvg.h
@@ -199,7 +199,8 @@ void nsvgDelete(NSVGimage* image);
 #define NSVG_ALIGN_MEET 1
 #define NSVG_ALIGN_SLICE 2
 
-#define NSVG_NOTUSED(v) do { (void)(1 ? (void)0 : ( (void)(v) ) ); } while(0)
+//#define NSVG_NOTUSED(v) do { (void)(1 ? (void)0 : ( (void)(v) ) ); } while(0)
+#define NSVG_NOTUSED(v) do { (void)(v); } while(0)
 #define NSVG_RGB(r, g, b) (((unsigned int)r) | ((unsigned int)g << 8) | ((unsigned int)b << 16))
 
 #ifdef _MSC_VER