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
commit4a608f34351c8719ab8f45d1ec8777f213a50573 (patch)
tree9eea7c90a71f10eba75ecb9602eb099279bfcafc
parent36ced48deea18763aeee72344d97d9e92a14fa75 (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 426b073..fce3641 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>
* oldx.pc.in:
diff --git a/configure.ac b/configure.ac
index 43003d5..eaa9a6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ PKG_CHECK_MODULES(OLDX, x11)
AC_SUBST(OLDX_CFLAGS)
AC_SUBST(OLDX_LIBS)
+XORG_CHECK_MALLOC_ZERO
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 9f745aa..2cda798 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = -I$(top_srcdir)/include/X11
liboldX_la_LIBADD = @OLDX_LIBS@
-AM_CFLAGS = @OLDX_CFLAGS@
+AM_CFLAGS = @OLDX_CFLAGS@ @MALLOC_ZERO_CFLAGS@
liboldX_la_LDFLAGS = -version-number 6:0:0 -no-undefined