libX11: Changes to 'master'

[Alan Coopersmith]

 src/Makefile.am |    1 -
 src/Xrm.c       |   15 ++++++++-------
 src/XrmI.h      |   46 ----------------------------------------------
 3 files changed, 8 insertions(+), 54 deletions(-)

New commits:
commit 50f4107811249806718a100f9d34f996c58e5e25
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Feb 2 08:58:45 2011 -0800

    Xrm.c: ReadInFile: refactor fstat error handling
    
    We can simplify the fstat failure case now that the GetFileSize macro
    has been expanded inline.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>

commit 5e9c40fcb5da43c9fdacf12967d090bf202daf2a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Feb 2 08:56:00 2011 -0800

    Expand GetSizeOfFile() macro at the one place it's called
    
    Removes XrmI.h header that only contained this single macro
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>