libXmu: Branch 'master'

[Alan Coopersmith]

 src/ShapeWidg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22d9c590901e121936f50dee97dc60c4f7defb63
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Dec 2 13:00:05 2013 -0800

    ShapeEllipseOrRoundedRectangle: Check height AND width, not width twice
    
    Fixed to match check in ShapeOval()
    https://bugs.freedesktop.org/show_bug.cgi?id=72245
    
    Fixes cppcheck warning:
    [ShapeWidg.c:204]: (style) Same expression on both sides of '||'.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/ShapeWidg.c b/src/ShapeWidg.c
index 32388ee..3ca7116 100644
--- a/src/ShapeWidg.c
+++ b/src/ShapeWidg.c
@@ -201,7 +201,7 @@ ShapeEllipseOrRoundedRectangle(Widget w, Bool ellipse, int ew, int eh)
     GC gc;
   unsigned long mask;
 
-  if (width < 3 || width < 3)
+  if (width < 3 || height < 3)
     return;
   width += w->core.border_width << 1;
   height += w->core.border_width << 1;