summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--boilerplate/Makefile.am5
-rw-r--r--boilerplate/cairo-boilerplate-system.c (renamed from boilerplate/xmalloc.c)2
-rw-r--r--boilerplate/cairo-boilerplate-system.h (renamed from boilerplate/xmalloc.h)0
-rw-r--r--boilerplate/cairo-boilerplate.h2
4 files changed, 5 insertions, 4 deletions
diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 9733b5b3..b47b0612 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -8,8 +8,9 @@ libcairoboilerplate_la_SOURCES = \
cairo-boilerplate-getopt.c \
cairo-boilerplate-getopt.h \
cairo-boilerplate-scaled-font.h \
- xmalloc.c \
- xmalloc.h
+ cairo-boilerplate-system.c \
+ cairo-boilerplate-system.h \
+ $(NULL)
libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
if CAIRO_HAS_BEOS_SURFACE
diff --git a/boilerplate/xmalloc.c b/boilerplate/cairo-boilerplate-system.c
index 12f12e9e..af076815 100644
--- a/boilerplate/xmalloc.c
+++ b/boilerplate/cairo-boilerplate-system.c
@@ -26,7 +26,7 @@
#define _GNU_SOURCE 1 /* for vasprintf */
#include "cairo-boilerplate.h"
-#include "xmalloc.h"
+#include "cairo-boilerplate-system.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/boilerplate/xmalloc.h b/boilerplate/cairo-boilerplate-system.h
index 51273a74..51273a74 100644
--- a/boilerplate/xmalloc.h
+++ b/boilerplate/cairo-boilerplate-system.h
diff --git a/boilerplate/cairo-boilerplate.h b/boilerplate/cairo-boilerplate.h
index d2fa4708..b5c72951 100644
--- a/boilerplate/cairo-boilerplate.h
+++ b/boilerplate/cairo-boilerplate.h
@@ -187,6 +187,6 @@ cairo_boilerplate_version (void);
const char*
cairo_boilerplate_version_string (void);
-#include "xmalloc.h"
+#include "cairo-boilerplate-system.h"
#endif