xcompmgr: Changes to 'master'

[Alan Coopersmith]

 xcompmgr.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit db973127f8ee0dfad1e15a577bfa184b5fddc862
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Nov 18 23:50:57 2011 -0800

    Only define shape_kind() function if DEBUG_SHAPE is true
    
    Fixes gcc warning:
    xcompmgr.c:1762:1: warning: ‘shape_kind’ defined but not used
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 2d23afb54eb63f7511b16ecb17e5b90f841b2966
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Nov 18 23:46:27 2011 -0800

    Make dpy a local variable instead of a global
    
    Fixes many gcc -Wshadow warnings
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>