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
commitd480f9dbd3e07b4e139f2a1422f803e6e6264854 (patch)
treeb278c8e690631c01a17f68c32e166951bc46d9b4
parent2a591fe7b3416d8609bd71cb068f9390105ffecf (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 f9a4dd9..2141448 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>
* xt.pc.in:
diff --git a/configure.ac b/configure.ac
index 341afea..4d17fb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,7 @@ XORG_MANPAGE_SECTIONS
# Check render configuration, strip extra digits from package version to
# find the required protocol version
+XORG_CHECK_MALLOC_ZERO
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 0beebba..d5ed131 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ CLEANFILES = $(BUILT_SOURCES)
SRCH_DEFINES = -DXFILESEARCHPATHDEFAULT=\"$(XFILESEARCHPATHDEFAULT)\"
-AM_CFLAGS = $(XT_CFLAGS) $(X11_CFLAGS) $(SRCH_DEFINES)
+AM_CFLAGS = $(XT_CFLAGS) $(X11_CFLAGS) $(SRCH_DEFINES) $(XTMALLOC_ZERO_CFLAGS)
INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include -I$(top_builddir)/include/X11