summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-12-03 04:41:52 +0000
committerKevin E Martin <kem@kem.org>2005-12-03 04:41:52 +0000
commit9acf2665b699c19a38e90b3b46f91c950c91c8f3 (patch)
tree437c3bacf9e9d935c959df95757e468b4eb2f327
parent23528bbea55e9307fb23f66d64d72d6ed0c68513 (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 988348d..9435c1a 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>
* xxf86misc.pc.in:
diff --git a/configure.ac b/configure.ac
index 9f0ae25..cece7aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ AC_PROG_LIBTOOL
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto)
+XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
diff --git a/src/Makefile.am b/src/Makefile.am
index 5572019..715b82d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,6 @@ lib_LTLIBRARIES = libXxf86misc.la
libXxf86misc_la_SOURCES = XF86Misc.c
-AM_CFLAGS = $(XXF86MISC_CFLAGS)
+AM_CFLAGS = $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS)
libXxf86misc_la_LDFLAGS = -version-number 1:1:0