summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2019-02-17 23:02:55 +0100
committerCarlos Garnacho <carlosg@gnome.org>2019-02-17 23:02:55 +0100
commite598a63dd048f43c58a5f62ec888c73c9a77fa45 (patch)
treee51b703001f2ad9f1493026a884826d6c0896714
parent58706035a21e080256ba6169704e3239d3725d9c (diff)
parent753ba2b92b28b700fb43e0b90df4ecaec28a981c (diff)
downloadtracker-e598a63dd048f43c58a5f62ec888c73c9a77fa45.tar.gz
Merge branch 'wip/mschraal/meson-log-domain'
-rw-r--r--meson.build7
-rw-r--r--src/libtracker-sparql/tracker-resource.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index 40054a937..b282d526a 100644
--- a/meson.build
+++ b/meson.build
@@ -64,7 +64,12 @@ add_project_arguments('-Wformat', '-Wformat-security', language: 'c')
# modules, it's not worth adding casts everywhere so we disable the warning.
add_project_arguments('-Wno-pointer-sign', language: 'c')
-add_project_arguments('-DTRACKER_COMPILATION', language: 'c')
+add_project_arguments('-DTRACKER_COMPILATION',
+ '-DG_LOG_DOMAIN="Tracker"',
+ language: 'c')
+add_project_arguments(['-D', 'TRACKER_COMPILATION'],
+ ['-D', 'G_LOG_DOMAIN="Tracker"'],
+ language: 'vala')
enable_fts = get_option('fts')
diff --git a/src/libtracker-sparql/tracker-resource.c b/src/libtracker-sparql/tracker-resource.c
index 6000e3862..33fc65416 100644
--- a/src/libtracker-sparql/tracker-resource.c
+++ b/src/libtracker-sparql/tracker-resource.c
@@ -17,12 +17,13 @@
* Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include <glib.h>
#include <json-glib/json-glib.h>
#include <string.h>
-#include "config.h"
#include <tracker-uri.h>
#include <tracker-resource.h>
#include <tracker-ontologies.h>