macros: Changes to 'master'

[Gaetan Nadon]

 xorg-macros.m4.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 48e2b3d0ee8d637d83b88bf29c6d417f61aaa0e4
Author: Colin Watson <cjwatson at canonical.com>
Date:   Sat Oct 10 13:28:28 2009 +0100

    Use conservative default for malloc(0) when cross-compiling #24460
    
    When cross-compiling, AC_RUN_IFELSE can't run test programs.
    MALLOC_ZERO_RETURNS_NULL=yes is a conservative default in this case.
    
    Signed-off-by: Colin Watson <cjwatson at canonical.com>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>