diff options
author | Tim-Philipp Müller <tim@centricular.com> | 2020-09-24 12:42:54 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2020-09-29 15:50:53 +0000 |
commit | 4ea2991a40d547d3c7800f862206741625a84417 (patch) | |
tree | 8e74701e5844b02919a052c111cbee6863cd910e /boilerplate | |
parent | 96017adf652433584d2a81add601409c3a5d9cd5 (diff) |
Retire dummy cairo-version.h header to fix meson subproject build
It was originally added to make bisecting easier,
but has outlived its usefuleness now.
Going forward we'll have just a single cairo-version.h
header file, the one with the real version numbers.
This is needed to fix the case where cairo is being
built as a Meson subproject, but also simplifies
things in general.
Fixes #421
Diffstat (limited to 'boilerplate')
-rw-r--r-- | boilerplate/cairo-boilerplate-test-surfaces.c | 2 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate.c | 6 | ||||
-rw-r--r-- | boilerplate/check-link.c | 7 |
3 files changed, 0 insertions, 15 deletions
diff --git a/boilerplate/cairo-boilerplate-test-surfaces.c b/boilerplate/cairo-boilerplate-test-surfaces.c index 293b77fff..64e669783 100644 --- a/boilerplate/cairo-boilerplate-test-surfaces.c +++ b/boilerplate/cairo-boilerplate-test-surfaces.c @@ -24,8 +24,6 @@ * Author: Carl D. Worth <cworth@cworth.org> */ -#include "../cairo-version.h" - #include "cairo-boilerplate-private.h" #include <cairo-types-private.h> diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c index 4804deaff..383606177 100644 --- a/boilerplate/cairo-boilerplate.c +++ b/boilerplate/cairo-boilerplate.c @@ -24,8 +24,6 @@ * Author: Carl D. Worth <cworth@cworth.org> */ -#define CAIRO_VERSION_H 1 - #include "cairo-boilerplate-private.h" #include "cairo-boilerplate-scaled-font.h" @@ -38,10 +36,6 @@ #include <cairo-script.h> #endif -/* get the "real" version info instead of dummy cairo-version.h */ -#undef CAIRO_VERSION_H -#include "../cairo-version.h" - #include <stddef.h> #include <stdlib.h> #include <ctype.h> diff --git a/boilerplate/check-link.c b/boilerplate/check-link.c index f16444878..688339a95 100644 --- a/boilerplate/check-link.c +++ b/boilerplate/check-link.c @@ -1,11 +1,4 @@ -#define CAIRO_VERSION_H 1 - #include <cairo-boilerplate.h> - -/* get the "real" version info instead of dummy cairo-version.h */ -#undef CAIRO_VERSION_H -#include "../cairo-version.h" - #include <stdio.h> int |