summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@canonical.com>2009-10-10 13:28:28 +0100
committerGaetan Nadon <memsize@videotron.ca>2009-12-15 09:29:03 -0500
commit48e2b3d0ee8d637d83b88bf29c6d417f61aaa0e4 (patch)
treef7da3de391f98da5d2564c395e1400e555c60c59
parent2c83c9068167729652994cf3203ca27245745482 (diff)
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@canonical.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--xorg-macros.m4.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index 6f9635f..393186f 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -339,7 +339,8 @@ main() {
exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
}],
[MALLOC_ZERO_RETURNS_NULL=yes],
- [MALLOC_ZERO_RETURNS_NULL=no])
+ [MALLOC_ZERO_RETURNS_NULL=no],
+ [MALLOC_ZERO_RETURNS_NULL=yes])
fi
AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])