diff options
| author | afdw <afdw@yandex.ru> | 2021-05-29 16:21:31 +0000 |
|---|---|---|
| committer | Anton Danilkin <afdw@yandex.ru> | 2021-05-29 18:32:53 +0200 |
| commit | 9ab52c9131767486700e286a7732dab1ed2e48d5 (patch) | |
| tree | f4da6e50abcd6596b91b414484483b20d37f3e12 /boilerplate | |
| parent | ec2cf9ac35c24495c60fff4e2fd8668bcc9ed612 (diff) | |
| parent | 63f0d6268469dcd12316ea405a026f4be900dd79 (diff) | |
| download | cairo-9ab52c9131767486700e286a7732dab1ed2e48d5.tar.gz | |
Merge branch 'master' into 'svg-backend-work'
# Conflicts:
# .gitlab-ci.yml
# test/Makefile.sources
# test/meson.build
Diffstat (limited to 'boilerplate')
| -rw-r--r-- | boilerplate/cairo-boilerplate-system.c | 2 | ||||
| -rw-r--r-- | boilerplate/cairo-boilerplate.h | 2 | ||||
| -rw-r--r-- | boilerplate/meson.build | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/boilerplate/cairo-boilerplate-system.c b/boilerplate/cairo-boilerplate-system.c index ec23341a4..e9bcd78c5 100644 --- a/boilerplate/cairo-boilerplate-system.c +++ b/boilerplate/cairo-boilerplate-system.c @@ -23,8 +23,6 @@ * Author: Carl D. Worth <cworth@cworth.org> */ -#define _GNU_SOURCE 1 /* for vasprintf */ - #include "cairo-boilerplate.h" #include "cairo-boilerplate-system.h" diff --git a/boilerplate/cairo-boilerplate.h b/boilerplate/cairo-boilerplate.h index 515bb03bc..544d38816 100644 --- a/boilerplate/cairo-boilerplate.h +++ b/boilerplate/cairo-boilerplate.h @@ -26,9 +26,7 @@ #ifndef _CAIRO_BOILERPLATE_H_ #define _CAIRO_BOILERPLATE_H_ -#if HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> diff --git a/boilerplate/meson.build b/boilerplate/meson.build index 79d1eeea4..0216b7a6c 100644 --- a/boilerplate/meson.build +++ b/boilerplate/meson.build @@ -35,8 +35,6 @@ cairo_boilerplate_constructors = custom_target('cairo-boilerplate-constructors.c command: [python3, files('make-cairo-boilerplate-constructors.py')[0], '@OUTPUT@', '@INPUT@']) libcairoboilerplate = static_library('cairoboilerplate', cairo_boilerplate_sources + [cairo_boilerplate_constructors], - c_args: ['-DHAVE_CONFIG_H'], - cpp_args: ['-DHAVE_CONFIG_H'], include_directories: [incbase, incsrc], dependencies: deps, link_with: [libcairo], |