summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-12-03 04:41:49 +0000
committerKevin E Martin <kem@kem.org>2005-12-03 04:41:49 +0000
commitf8652da907e902e4ee0b682851e2918a363f0d3d (patch)
treefd1e0ba982479fd4c7c1b5fd45e3cedea0bdf96d
parent5401f8a75cdc9ef218acda9a25f440ff136d2543 (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 7217a5b..22c07a3 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>
* xi.pc.in:
diff --git a/configure.ac b/configure.ac
index ca63a84..a0f2b2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,7 @@ PKG_CHECK_MODULES(XI, xproto x11 xextproto xext inputproto)
AC_SUBST(XI_CFLAGS)
AC_SUBST(XI_LIBS)
+XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
diff --git a/src/Makefile.am b/src/Makefile.am
index 67c3134..b2c0cad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,7 +44,7 @@ libXi_la_SOURCES = \
libXi_la_LIBADD = $(XI_LIBS)
-AM_CFLAGS = $(XI_CFLAGS)
+AM_CFLAGS = $(XI_CFLAGS) $(MALLOC_ZERO_CFLAGS)
#INCLUDES = -I$(top_srcdir)/include/X11/extensions