summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-12-03 04:41:48 +0000
committerKevin E Martin <kem@kem.org>2005-12-03 04:41:48 +0000
commitf84239e6f526a4b52158c4670da8d1bd02d527f2 (patch)
treeae97d87bd94d7c23a6993b37c16d0f201479791e
parentf125e444a022300ae4aa69db2d209cc3c2fbbe0b (diff)
downloadxorg-lib-libXRes-f84239e6f526a4b52158c4670da8d1bd02d527f2.tar.gz
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 d36465f..aec288d 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>
* xres.pc.in:
diff --git a/configure.ac b/configure.ac
index 45af00d..d62a12d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,7 @@ if test "x$GCC" = "xyes"; then
CFLAGS="$GCC_WARNINGS $CFLAGS"
fi
+XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
diff --git a/src/Makefile.am b/src/Makefile.am
index 9128aee..97605b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ libXRes_la_SOURCES = \
libXRes_la_LIBADD = @RESOURCEEXT_LIBS@ @XRES_LIBS@
-AM_CFLAGS = @RESOURCEEXT_CFLAGS@ @XRES_CFLAGS@
+AM_CFLAGS = @RESOURCEEXT_CFLAGS@ @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
INCLUDES = -I$(top_srcdir)/include