summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-12-03 04:41:50 +0000
committerKevin E Martin <kem@kem.org>2005-12-03 04:41:50 +0000
commitbacedae4107065e7b6617f3218f21a7321d8474c (patch)
treedcef785c890b446b2a281006306770f2987c400b
parentd1078682cc64b0a669c6180839efd8a137b90d13 (diff)
Add check and cflags for malloc(0) returning NULL.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bbcaee5..f00a23a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ * src/Makefile.am:
+ Add check and cflags for malloc(0) returning NULL.
+
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
* xinerama.pc.in:
diff --git a/configure.ac b/configure.ac
index 20f3f6b..d960497 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,7 @@ PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto xineramaproto)
AC_SUBST(XINERAMA_CFLAGS)
AC_SUBST(XINERAMA_LIBS)
+XORG_CHECK_MALLOC_ZERO
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 60158fa..098ff05 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(XINERAMA_CFLAGS)
+AM_CFLAGS = $(XINERAMA_CFLAGS) $(MALLOC_ZERO_CFLAGS)
lib_LTLIBRARIES = libXinerama.la
libXinerama_la_SOURCES = \