From 01bd7910ce1e2500324b3453cf6b3f103ecc1815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Fri, 6 Mar 2020 18:16:54 +0100
Subject: [PATCH] testsuite/css: Add common_cflags to build

And fix all the errors coming from that.
---
 testsuite/css/change/meson.build       | 1 +
 testsuite/css/change/test-css-change.c | 2 +-
 testsuite/css/meson.build              | 2 ++
 testsuite/css/nodes/meson.build        | 1 +
 testsuite/css/parser/meson.build       | 1 +
 testsuite/css/style/meson.build        | 1 +
 testsuite/css/style/test-css-style.c   | 2 +-
 7 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/testsuite/css/change/meson.build b/testsuite/css/change/meson.build
index 3637a244a8..5398e5da44 100644
--- a/testsuite/css/change/meson.build
+++ b/testsuite/css/change/meson.build
@@ -4,6 +4,7 @@ testdatadir = join_paths(installed_test_datadir, 'css')
 test_change = executable(
   'test-css-change',
   'test-css-change.c',
+  c_args: common_cflags,
   dependencies: libgtk_dep,
   install: get_option('install-tests'),
   install_dir: testexecdir,
diff --git a/testsuite/css/change/test-css-change.c b/testsuite/css/change/test-css-change.c
index add2227f65..830f53fbfd 100644
--- a/testsuite/css/change/test-css-change.c
+++ b/testsuite/css/change/test-css-change.c
@@ -29,7 +29,7 @@
 /* There shall be no other styles */
 #define GTK_STYLE_PROVIDER_PRIORITY_FORCE G_MAXUINT
 
-char *
+static char *
 test_get_other_file (const char *ui_file, const char *extension)
 {
   GString *file = g_string_new (NULL);
diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build
index 237f4732d2..43f7a100d0 100644
--- a/testsuite/css/meson.build
+++ b/testsuite/css/meson.build
@@ -7,6 +7,7 @@ testexecdir = join_paths(installed_test_bindir, 'css')
 testdatadir = join_paths(installed_test_datadir, 'css')
 
 test_api = executable('api', 'api.c',
+                      c_args: common_cflags,
                       dependencies: libgtk_dep,
                       install: get_option('install-tests'),
                       install_dir: testexecdir)
@@ -23,6 +24,7 @@ test('api', test_api,
      suite: 'css')
 
 test_data = executable('data', ['data.c', '../../gtk/css/gtkcssdataurl.c'],
+                       c_args: common_cflags,
                        include_directories: [confinc, ],
                        dependencies: gtk_deps,
                        install: get_option('install-tests'),
diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build
index 42e7b215dc..264ff58847 100644
--- a/testsuite/css/nodes/meson.build
+++ b/testsuite/css/nodes/meson.build
@@ -2,6 +2,7 @@ testexecdir = join_paths(installed_test_bindir, 'css', 'nodes')
 testdatadir = join_paths(installed_test_datadir, 'css')
 
 test_nodes = executable('test-css-nodes', 'test-css-nodes.c',
+                        c_args: common_cflags,
                         install: get_option('install-tests'),
                         install_dir: testexecdir,
                         dependencies: libgtk_dep)
diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build
index 9e501a0bd2..ea4b815a59 100644
--- a/testsuite/css/parser/meson.build
+++ b/testsuite/css/parser/meson.build
@@ -2,6 +2,7 @@ testexecdir = join_paths(installed_test_bindir, 'css', 'parser')
 testdatadir = join_paths(installed_test_datadir, 'css')
 
 test_parser = executable('test-css-parser', 'test-css-parser.c',
+                         c_args: common_cflags,
                          install: get_option('install-tests'),
                          install_dir: testexecdir,
                          dependencies: libgtk_dep)
diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build
index 4f4921e946..efc635b44a 100644
--- a/testsuite/css/style/meson.build
+++ b/testsuite/css/style/meson.build
@@ -11,6 +11,7 @@ test_style = executable(
   'test-css-style',
   'test-css-style.c',
   cssresources,
+  c_args: common_cflags,
   dependencies: libgtk_dep,
   install: get_option('install-tests'),
   install_dir: testexecdir,
diff --git a/testsuite/css/style/test-css-style.c b/testsuite/css/style/test-css-style.c
index 6e6a59466e..5c40c5cdac 100644
--- a/testsuite/css/style/test-css-style.c
+++ b/testsuite/css/style/test-css-style.c
@@ -29,7 +29,7 @@
 /* There shall be no other styles */
 #define GTK_STYLE_PROVIDER_PRIORITY_FORCE G_MAXUINT
 
-char *
+static char *
 test_get_other_file (const char *ui_file, const char *extension)
 {
   GString *file = g_string_new (NULL);