xdpyinfo: Changes to 'master'

[Alan Coopersmith]

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

New commits:
commit 86c2e6f13b5c77b193762ff7e0628d7957e6bf0b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Feb 17 23:06:01 2015 -0800

    Delete unused NULLSTR macro
    
    Spotted by clang:
    
    xdpyinfo.c:145:9: warning: macro is not used [-Wunused-macros]
            ^
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 5ea2adab785079f7b87a459654696d2fff248a52
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Feb 17 23:00:56 2015 -0800

    Mark required arguments to Xlib error handler as unused
    
    Quiets clang warnings:
    
    xdpyinfo.c:151:24: warning: unused parameter 'dpy' [-Wunused-parameter]
    silent_errors(Display *dpy, XErrorEvent *ev)
                           ^
    xdpyinfo.c:151:42: warning: unused parameter 'ev' [-Wunused-parameter]
    silent_errors(Display *dpy, XErrorEvent *ev)
                                             ^
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>