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
commit127ec4993118efe56caef761febef86eae2b7300 (patch)
treeedcb466fb67c912a5b443139f042eefde19d5cdf
parent89f4aca8d76806edf51d4999223011cbff1c3f55 (diff)
Add check and cflags for malloc(0) returning NULL.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 27e7ce9..dd27aae 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>
* xrandr.pc.in:
diff --git a/configure.ac b/configure.ac
index 1903a98..823abfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,7 @@ PKG_CHECK_MODULES(RANDR, randrproto >= $RANDR_VERSION xext xextproto xrender ren
AC_SUBST(RANDR_CFLAGS)
AC_SUBST(RANDR_LIBS)
+XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
@@ -64,4 +65,3 @@ AC_OUTPUT([Makefile
src/Makefile
man/Makefile
xrandr.pc])
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 25acc8d..dce56e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ libXrandr_la_SOURCES = \
Xrandrint.h
libXrandr_la_LIBADD = @X_LIBS@ @RANDR_LIBS@
-AM_CFLAGS = @X_CFLAGS@ @RANDR_CFLAGS@
+AM_CFLAGS = @X_CFLAGS@ @RANDR_CFLAGS@ @MALLOC_ZERO_CFLAGS@
INCLUDES = -I$(top_srcdir)/include/X11/extensions