Merge branch 'ebassi/config-define' into 'master'

meson: Define HAVE_CONFIG_H as a project flag See merge request cairo/cairo!172
2026-05-05 13:28:03 +02:00 · 2021-05-02 05:48:26 +00:00 · 2021-05-02 05:48:26 +00:00 · aa02315243
commit aa02315243
parent 8f6cfe4177 bd13841257
52 changed files with 25 additions and 106 deletions
--- 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"

--- 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>
--- 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],
--- a/meson.build
+++ b/meson.build
@ -45,6 +45,9 @@ endif

 add_project_arguments('-D_GNU_SOURCE', language: 'c')

+# Autotools compatibility
+add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
+
 # Make sure source directory hasn't been configured with autotools
 if meson.version().version_compare('>= 0.53')
  fs = import('fs')
--- a/perf/cairo-analyse-trace.c
+++ b/perf/cairo-analyse-trace.c
@ -29,7 +29,7 @@
 *	    Chris Wilson <chris@chris-wilson.co.uk>
 */

-#define _GNU_SOURCE 1	/* for sched_getaffinity() and getline() */
+#include "config.h"

 #include "cairo-perf.h"
 #include "cairo-stats.h"
--- a/perf/cairo-perf-micro.c
+++ b/perf/cairo-perf-micro.c
@ -26,7 +26,7 @@
 *	    Carl Worth <cworth@cworth.org>
 */

-#define _GNU_SOURCE 1	/* for sched_getaffinity() */
+#include "config.h"

 #include "cairo-perf.h"
 #include "cairo-stats.h"
--- a/perf/cairo-perf-print.c
+++ b/perf/cairo-perf-print.c
@ -27,9 +27,7 @@
 *	    Chris Wilson <chris@chris-wilson.co.uk>
 */

-#if HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "cairo-perf.h"
 #include "cairo-stats.h"
--- a/perf/cairo-perf-report.c
+++ b/perf/cairo-perf-report.c
@ -25,16 +25,14 @@
 * Authors: Carl Worth <cworth@cworth.org>
 */

+#include "config.h"
+
 #define _GETDELIM 1/* for getline() on AIX */

 #include "cairo-perf.h"
 #include "cairo-missing.h"
 #include "cairo-stats.h"

-/* We use _GNU_SOURCE for getline and strndup if available. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- a/perf/cairo-perf-trace.c
+++ b/perf/cairo-perf-trace.c
@ -28,7 +28,7 @@
 *	    Chris Wilson <chris@chris-wilson.co.uk>
 */

-#define _GNU_SOURCE 1	/* for sched_getaffinity() and getline() */
+#include "config.h"

 #include "cairo-missing.h"
 #include "cairo-perf.h"
--- a/src/cairo-atomic-private.h
+++ b/src/cairo-atomic-private.h
@ -39,11 +39,9 @@
 #ifndef CAIRO_ATOMIC_PRIVATE_H
 #define CAIRO_ATOMIC_PRIVATE_H

-# include "cairo-compiler-private.h"
+#include "cairo-compiler-private.h"

-#if HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <assert.h>

--- a/src/cairo-compiler-private.h
+++ b/src/cairo-compiler-private.h
@ -40,9 +40,7 @@

 #include "cairo.h"

-#if HAVE_CONFIG_H
 #include "config.h"
-#endif

 /* Size in bytes of buffer to use off the stack per functions.
 * Mostly used by text functions.  For larger allocations, they'll
--- a/src/cairo-misc.c
+++ b/src/cairo-misc.c
@ -38,8 +38,6 @@
 *      Adrian Johnson <ajohnson@redneon.com>
 */

-#define _GNU_SOURCE 1	/* strtod_l() */
-
 #include "cairoint.h"
 #include "cairo-error-private.h"

--- a/src/cairo-mutex-impl-private.h
+++ b/src/cairo-mutex-impl-private.h
@ -43,9 +43,7 @@

 #include "cairo.h"

-#if HAVE_CONFIG_H
 #include "config.h"
-#endif

 #if HAVE_LOCKDEP
 #include <lockdep.h>
--- a/src/cairo-quartz-surface.c
+++ b/src/cairo-quartz-surface.c
@ -34,7 +34,6 @@
 *	Vladimir Vukicevic <vladimir@mozilla.com>
 */

-#define _GNU_SOURCE /* required for RTLD_DEFAULT */
 #include "cairoint.h"

 #include "cairo-quartz-private.h"
--- a/src/cairo-wideint-type-private.h
+++ b/src/cairo-wideint-type-private.h
@ -39,9 +39,7 @@

 #include "cairo.h"

-#if HAVE_CONFIG_H
 #include "config.h"
-#endif

 #if   HAVE_STDINT_H
 # include <stdint.h>
--- a/src/cairoint.h
+++ b/src/cairoint.h
@ -46,9 +46,7 @@
 #ifndef _CAIROINT_H_
 #define _CAIROINT_H_

-#if HAVE_CONFIG_H
 #include "config.h"
-#endif

 #ifdef _MSC_VER
 #define cairo_public __declspec(dllexport)
--- a/src/meson.build
+++ b/src/meson.build
@ -296,8 +296,8 @@ incsrc = include_directories('.')

 libcairo = library('cairo', cairo_sources,
  dependencies: deps,
-  c_args: cairo_no_warn_c_args + pthread_c_args + ['-DHAVE_CONFIG_H'],
-  cpp_args: cairo_no_warn_c_args + pthread_c_args + ['-DHAVE_CONFIG_H'],
+  c_args: cairo_no_warn_c_args + pthread_c_args,
+  cpp_args: cairo_no_warn_c_args + pthread_c_args,
  link_args: extra_link_args,
  soversion: cairo_version_sonum,
  version: cairo_libversion,
--- a/test/any2ppm.c
+++ b/test/any2ppm.c
@ -50,9 +50,7 @@
 * Author: Kristian Høgsberg <krh@redhat.com>
 */

-#if HAVE_CONFIG_H
 #include "config.h"
-#endif

 #if HAVE_UNISTD_H
 #include <unistd.h>
--- a/test/api-special-cases.c
+++ b/test/api-special-cases.c
@ -56,9 +56,7 @@
 * enough to just add a new check to the function it complained about.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <assert.h>
 #include <limits.h>
--- a/test/buffer-diff.c
+++ b/test/buffer-diff.c
@ -23,9 +23,7 @@
 *
 * Author: Richard D. Worth <richard@theworths.org> */

-#if HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <stdio.h>
 #include <stdlib.h>
--- a/test/cairo-test-trace.c
+++ b/test/cairo-test-trace.c
@ -52,8 +52,6 @@
 *     scope of this test.
 */

-#define _GNU_SOURCE 1	/* getline() */
-
 #include "cairo-test.h"
 #include "buffer-diff.h"

--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@ -25,11 +25,7 @@
 *         Chris Wilson <chris@chris-wilson.co.uk>
 */

-#define _GNU_SOURCE 1	/* for feenableexcept() et al */
-
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <stdio.h>
 #include <stdlib.h>
--- a/test/error-setters.c
+++ b/test/error-setters.c
@ -23,9 +23,7 @@
 * Author: Benjamin Otte <otte@redhat.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <limits.h>

--- a/test/fallback-resolution.c
+++ b/test/fallback-resolution.c
@ -25,9 +25,7 @@
 *         Chris Wilson <chris@chris-wilson.co.uk>
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <stdio.h>
 #include <stdlib.h>
--- a/test/imagediff.c
+++ b/test/imagediff.c
@ -23,9 +23,7 @@
 *
 * Author: Richard D. Worth <richard@theworths.org> */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <stdio.h>
 #include <stdlib.h>
--- a/test/invalid-matrix.c
+++ b/test/invalid-matrix.c
@ -25,8 +25,8 @@
 */

 #define _ISOC99_SOURCE	/* for INFINITY */
-#define _GNU_SOURCE 1	/* for fedisableeexcept() et al */

+#include "config.h"
 #include "cairo-test.h"

 #if !defined(INFINITY)
--- a/test/meson.build
+++ b/test/meson.build
@ -597,7 +597,6 @@ endif

 if build_any2ppm
  any2ppm_exe = executable('any2ppm', 'any2ppm.c',
-    c_args: ['-DHAVE_CONFIG_H'],
    include_directories: [incbase, incsrc, inccairoscript],
    link_with: [libcairo, libcairoscript],
    dependencies: deps + test_deps,
@ -608,7 +607,7 @@ endif
 if have_shm
  cairo_test_trace_exe = executable('cairo-test-trace', cairo_test_trace_sources,
  include_directories: [incbase, incsrc, incboilerplate, incpdiff, inccairoscript, inccairomissing],
-  c_args: ['-DHAVE_CONFIG_H'] + pthread_c_args,
+  c_args: pthread_c_args,
  link_with: [libcairo, libcairoboilerplate, libpdiff, libcairoscript, libcairomissing],
  link_args: extra_link_args,
  dependencies: deps + test_deps + [rt_dep])
@ -616,7 +615,6 @@ endif

 exe = executable('cairo-test-suite', [cairo_test_suite_sources, test_sources, cairo_test_constructors],
  include_directories: [incbase, incsrc, incboilerplate, incpdiff],
-  c_args: ['-DHAVE_CONFIG_H'],
  link_with: [libcairo, libcairoboilerplate, libpdiff],
  link_args: extra_link_args,
  dependencies: deps + test_deps,
--- a/test/pdiff/meson.build
+++ b/test/pdiff/meson.build
@ -9,13 +9,11 @@ perceptualdiff_sources = [
 ]

 libpdiff = static_library('pdiff', libpdiff_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
  include_directories: [incbase, incsrc],
  dependencies: deps,
  link_with: [libcairo],
 )

 perceptualdiff = executable('perceptualdiff', perceptualdiff_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
  include_directories: [incbase, incsrc],
  link_with: [libpdiff])
--- a/test/pdiff/pdiff.c
+++ b/test/pdiff/pdiff.c
@ -14,11 +14,7 @@
  if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
 */

-#define _GNU_SOURCE
-
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "lpyramid.h"
 #include <math.h>
--- a/test/ps-eps.c
+++ b/test/ps-eps.c
@ -27,9 +27,7 @@
 *         Chris Wilson <chris@chris-wilson.co.uk>
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <stdio.h>
 #include <stdlib.h>
--- a/test/solid-pattern-cache-stress.c
+++ b/test/solid-pattern-cache-stress.c
@ -23,9 +23,7 @@
 * Author: Chris Wilson <chris at chris-wilson.co.uk>
 */

-#if HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "cairo-test.h"
 #include <stdlib.h> /* drand48() */
--- a/test/toy-font-face.c
+++ b/test/toy-font-face.c
@ -24,9 +24,7 @@
 *         Behdad Esfahbod <behdad@behdad.org>
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "cairo-test.h"

--- a/util/cairo-fdr/fdr.c
+++ b/util/cairo-fdr/fdr.c
@ -16,11 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#define _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <cairo.h>
 #include <cairo-script.h>
--- a/util/cairo-fdr/meson.build
+++ b/util/cairo-fdr/meson.build
@ -4,7 +4,6 @@ cairo_fdr_sources = [

 libcairofdr = library('cairo-fdr', cairo_fdr_sources,
  include_directories: [incbase, incsrc],
-  c_args: ['-DHAVE_CONFIG_H'],
  dependencies: deps,
  install: true,
  install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'),
--- a/util/cairo-gobject/cairo-gobject-enums.c
+++ b/util/cairo-gobject/cairo-gobject-enums.c
@ -1,9 +1,7 @@

 /* Generated data (by glib-mkenums) */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "cairo-gobject.h"

--- a/util/cairo-gobject/cairo-gobject-structs.c
+++ b/util/cairo-gobject/cairo-gobject-structs.c
@ -34,9 +34,7 @@
 *	Benjamin Otte <otte@redhat.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "cairo-gobject.h"

--- a/util/cairo-gobject/meson.build
+++ b/util/cairo-gobject/meson.build
@ -8,7 +8,6 @@ cairo_gobject_headers = [
 ]

 libcairogobject = library('cairo-gobject', cairo_gobject_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
  include_directories: [incbase, incsrc],
  dependencies: [glib_dep, gobject_dep],
  link_with: [libcairo],
--- a/util/cairo-missing/meson.build
+++ b/util/cairo-missing/meson.build
@ -6,7 +6,6 @@ cairo_missing_sources = [
 inccairomissing = include_directories('.')

 libcairomissing = static_library('cairo-missing', cairo_missing_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
  include_directories: [incbase, incsrc],
  install: false,
  build_by_default: false,
--- a/util/cairo-script/cairo-script-private.h
+++ b/util/cairo-script/cairo-script-private.h
@ -35,9 +35,7 @@
 #ifndef CAIRO_SCRIPT_PRIVATE_H
 #define CAIRO_SCRIPT_PRIVATE_H

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "cairo-script-interpreter.h"

--- a/util/cairo-script/meson.build
+++ b/util/cairo-script/meson.build
@ -26,7 +26,6 @@ csi_trace_sources = [

 libcairoscript = library('cairo-script-interpreter',
  cairoscript_interpreter_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
  include_directories: [incbase, incsrc],
  dependencies: deps,
  link_with: [libcairo],
@ -50,14 +49,12 @@ pkgmod.generate(libcairoscript,
 meson.override_dependency('cairo-script-interpreter', libcairoscript_dep)

 csi_replay_exe = executable('csi-replay', csi_replay_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
  include_directories: [incbase, incsrc],
  link_with: [libcairo, libcairoscript],
  dependencies: deps,
 )

 csi_exec_exe = executable('csi-exec', csi_exec_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
  include_directories: [incbase, incsrc],
  link_with: [libcairo, libcairoscript],
  dependencies: deps,
@ -65,7 +62,6 @@ csi_exec_exe = executable('csi-exec', csi_exec_sources,

 if feature_conf.get('CAIRO_HAS_SCRIPT_SURFACE', 0) == 1 and conf.get('HAVE_LIBGEN_H', 0) == 1
  csi_trace_exe = executable('csi-trace', csi_trace_sources,
-    c_args: ['-DHAVE_CONFIG_H'],
    include_directories: [incbase, incsrc],
    link_with: [libcairo, libcairoscript],
    dependencies: deps,
--- a/util/cairo-sphinx/fdr.c
+++ b/util/cairo-sphinx/fdr.c
@ -16,11 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#define _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <cairo.h>
 #include <cairo-script.h>
--- a/util/cairo-sphinx/meson.build
+++ b/util/cairo-sphinx/meson.build
@ -8,7 +8,6 @@ cairo_sphinx_sources = [

 libcairosphinx = library('cairo-sphinx', libcairo_sphinx_sources,
  include_directories: [incbase, incsrc],
-  c_args: ['-DHAVE_CONFIG_H'],
  dependencies: deps,
  install: true,
  install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'),
@ -18,7 +17,7 @@ libdir = join_paths(get_option('prefix'), get_option('libdir'))

 cairosphinx_exe = executable('cairo-sphinx', cairo_sphinx_sources,
  include_directories: [incbase, incsrc, inccairoscript, incboilerplate],
-  c_args: ['-DHAVE_CONFIG_H', '-DLIBDIR="@0@"'.format(libdir)] + pthread_c_args,
+  c_args: ['-DLIBDIR="@0@"'.format(libdir)] + pthread_c_args,
  dependencies: deps + [glib_dep, rt_dep],
  link_with: [libcairo, libcairosphinx, libcairoscript, libcairoboilerplate],
  link_args: extra_link_args,
--- a/util/cairo-sphinx/sphinx.c
+++ b/util/cairo-sphinx/sphinx.c
@ -6,9 +6,7 @@
 * delta-debugging to reduce that down to a minimal trace.)
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <stdio.h>
 #include <stdlib.h>
--- a/util/cairo-trace/lookup-symbol.c
+++ b/util/cairo-trace/lookup-symbol.c
@ -45,11 +45,7 @@
   This file was part of GNU Binutils.
   */

-#define _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #define true 1
 #define false 0
--- a/util/cairo-trace/meson.build
+++ b/util/cairo-trace/meson.build
@ -12,7 +12,7 @@ libcairotrace = library('cairo-trace', cairo_trace_sources,
  include_directories: [incbase, incsrc],
  dependencies: deps,
  link_args: extra_link_args,
-  c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext), '-DHAVE_CONFIG_H'] + pthread_c_args,
+  c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),] + pthread_c_args,
  install: true,
  install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'),
 )
--- a/util/cairo-trace/trace.c
+++ b/util/cairo-trace/trace.c
@ -16,11 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#define _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 /* The autoconf on OpenBSD 4.5 produces the malformed constant name
 * SIZEOF_VOID__ rather than SIZEOF_VOID_P.  Work around that here. */
--- a/util/show-contour.c
+++ b/util/show-contour.c
@ -1,4 +1,5 @@
-#define _GNU_SOURCE
+#include "config.h"
+
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <stdio.h>
--- a/util/show-edges.c
+++ b/util/show-edges.c
@ -1,4 +1,5 @@
-#define _GNU_SOURCE
+#include "config.h"
+
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <stdio.h>
--- a/util/show-events.c
+++ b/util/show-events.c
@ -1,4 +1,5 @@
-#define _GNU_SOURCE
+#include "config.h"
+
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <stdio.h>
--- a/util/show-polygon.c
+++ b/util/show-polygon.c
@ -1,4 +1,5 @@
-#define _GNU_SOURCE
+#include "config.h"
+
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <stdio.h>
--- a/util/show-traps.c
+++ b/util/show-traps.c
@ -1,4 +1,5 @@
-#define _GNU_SOURCE
+#include "config.h"
+
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <stdio.h>
--- a/util/trace-to-xml.c
+++ b/util/trace-to-xml.c
@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <cairo-xml.h>
 #include <cairo-script-interpreter.h>