ico: Changes to 'master'

Alan Coopersmith alanc at kemper.freedesktop.org
Thu Jan 3 20:13:18 PST 2013


 configure.ac |    2 +-
 ico.c        |   13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit d065113b4fadbb674e6e6f2a7681105f4f0212d3
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Jan 3 20:06:17 2013 -0800

    Fix some 64-bit vs. 32-bit conversion errors
    
    ico.c:851:7: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
            fg = WhitePixel(dpy, DefaultScreen(dpy));
               ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    ico.c:852:7: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
            bg = BlackPixel(dpy, DefaultScreen(dpy));
               ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    ico.c:858:18: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
                  bg = cdef.pixel;
                     ~ ~~~~~^~~~~
    
    ico.c:866:18: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
                  fg = cdef.pixel;
                     ~ ~~~~~^~~~~
    
    ico.c:874:11: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
                bg = tmp;
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 99ca5c8deb4a3ebd4b2a7e64bd64ca9a91b6680c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Jan 3 19:51:06 2013 -0800

    Mark a couple parameters as unused to silence compiler warnings
    
    ico.c:436:20: warning: unused parameter 'display' [-Wunused-parameter]
    predicate(Display *display, XEvent *event, XPointer args)
    
    ico.c:511:51: warning: unused parameter 'firsttime' [-Wunused-parameter]
    setDisplayBuf(struct closure *closure, int n, int firsttime)
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>



More information about the xorg-commit mailing list