GNOME.org
 

[tracker/wip/sam/meson: 15/15] Use `#ifdef` and `#elif defined()` instead of `#if` and `#elif`

commit 47adc7cdedf2fcfbd42ffc9b4dd13062617a1d19
Author: Sam Thursfield <sam afuera me uk>
Date:   Thu Feb 23 18:16:55 2017 +0000

    Use `#ifdef` and `#elif defined()` instead of `#if` and `#elif`
    
    This is for compatibility with Meson, which discourage uses of the
    latter form for configuration flags. (It can be made to work, but
    the resulting meson.build file is uglier).

 src/libtracker-data/tracker-collation.c           |    4 +-
 src/libtracker-data/tracker-data-manager.c        |   14 +++++-----
 src/libtracker-data/tracker-data-update.c         |   28 ++++++++++----------
 src/libtracker-data/tracker-db-interface-sqlite.c |   10 +++---
 src/libtracker-data/tracker-db-interface-sqlite.h |    2 +-
 src/libtracker-data/tracker-db-manager.c          |    2 +-
 src/tracker/tracker-search.c                      |    4 +-
 tests/libtracker-sparql/tracker-sparql-test.c     |   10 +++---
 8 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/src/libtracker-data/tracker-collation.c b/src/libtracker-data/tracker-collation.c
index 308f5ee..fff6808 100644
--- a/src/libtracker-data/tracker-collation.c
+++ b/src/libtracker-data/tracker-collation.c
@@ -37,7 +37,7 @@
 /* libunistring versions prior to 9.1.2 need this hack */
 #define _UNUSED_PARAMETER_
 #include <unistr.h>
-#elif HAVE_LIBICU
+#elif defined(HAVE_LIBICU)
 #include <unicode/ucol.h>
 #include <unicode/utypes.h>
 #endif
@@ -96,7 +96,7 @@ tracker_collation_utf8 (gpointer      collator,
        return result;
 }
 
-#elif HAVE_LIBICU /* ---- ICU based collation (UTF-16) ----*/
+#elif defined(HAVE_LIBICU) /* ---- ICU based collation (UTF-16) ----*/
 
 gpointer
 tracker_collation_init (void)
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 13fd0ad..c5fa527 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -30,7 +30,7 @@
 
 #include <glib/gstdio.h>
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
 #include <libtracker-fts/tracker-fts.h>
 #endif
 
@@ -3589,7 +3589,7 @@ load_ontologies_gvdb (GError **error)
        g_free (filename);
 }
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
 static gboolean
 ontology_get_fts_properties (gboolean     only_new,
                              GHashTable **fts_properties,
@@ -3654,7 +3654,7 @@ gboolean
 tracker_data_manager_init_fts (TrackerDBInterface *iface,
                                gboolean            create)
 {
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        GHashTable *fts_props, *multivalued;
 
        ontology_get_fts_properties (FALSE, &fts_props, &multivalued);
@@ -3702,7 +3702,7 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
 
        tracker_data_update_init ();
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        if (!tracker_fts_init ()) {
                g_warning ("FTS module initialization failed");
        }
@@ -4372,7 +4372,7 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
                        }
 
                        if (update_nao) {
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
                                GHashTable *fts_properties, *multivalued;
 
                                if (ontology_get_fts_properties (TRUE, &fts_properties, &multivalued)) {
@@ -4629,7 +4629,7 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
 
                tracker_db_manager_set_current_locale ();
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
                rebuild_fts_tokens (iface);
        } else if (!read_only && tracker_db_manager_get_tokenizer_changed ()) {
                rebuild_fts_tokens (iface);
@@ -4679,7 +4679,7 @@ tracker_data_manager_shutdown (void)
                tracker_locale_shutdown ();
        }
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        if (!tracker_fts_shutdown ()) {
                g_warning ("FTS module shutdown failed");
        }
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index b4390dd..623ac60 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -60,7 +60,7 @@ struct _TrackerDataUpdateBuffer {
        /* TrackerClass -> integer */
        GHashTable *class_counts;
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        gboolean fts_ever_updated;
 #endif
 };
@@ -77,7 +77,7 @@ struct _TrackerDataUpdateBufferResource {
        /* TrackerClass */
        GPtrArray *types;
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        gboolean fts_updated;
 #endif
 };
@@ -88,7 +88,7 @@ struct _TrackerDataUpdateBufferProperty {
        gint graph;
        gboolean date_time : 1;
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        gboolean fts : 1;
 #endif
 };
@@ -559,7 +559,7 @@ cache_insert_value (const gchar            *table_name,
 
        property.value = *value;
        property.graph = graph;
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        property.fts = fts;
 #endif
        property.date_time = date_time;
@@ -593,7 +593,7 @@ cache_delete_value (const gchar            *table_name,
        property.name = field_name;
        property.value = *value;
        property.graph = 0;
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        property.fts = fts;
 #endif
        property.date_time = date_time;
@@ -944,7 +944,7 @@ tracker_data_resource_buffer_flush (GError **error)
                }
        }
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        if (resource_buffer->fts_updated) {
                TrackerProperty *prop;
                GArray *values;
@@ -1051,7 +1051,7 @@ tracker_data_update_buffer_clear (void)
        g_hash_table_remove_all (update_buffer.resource_cache);
        resource_buffer = NULL;
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        update_buffer.fts_ever_updated = FALSE;
 #endif
 
@@ -1441,7 +1441,7 @@ get_old_property_values (TrackerProperty  *property,
                        return NULL;
                }
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
                if (tracker_property_get_fulltext_indexed (property)) {
                        TrackerDBInterface *iface;
 
@@ -2083,7 +2083,7 @@ cache_delete_resource_type_full (TrackerClass *class,
        if (!single_type) {
                if (strcmp (tracker_class_get_uri (class), TRACKER_PREFIX_RDFS "Resource") == 0 &&
                    g_hash_table_size (resource_buffer->tables) == 0) {
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
                        tracker_db_interface_sqlite_fts_delete_id (iface, resource_buffer->id);
 #endif
                        /* skip subclass query when deleting whole resource
@@ -2321,7 +2321,7 @@ resource_buffer_switch (const gchar *graph,
                } else {
                        resource_buffer->id = ensure_resource_id (resource_buffer->subject, 
&resource_buffer->create);
                }
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
                resource_buffer->fts_updated = FALSE;
 #endif
                if (resource_buffer->create) {
@@ -2961,7 +2961,7 @@ tracker_data_update_statement_with_uri (const gchar            *graph,
 
                multiple_values = tracker_property_get_multiple_values (property);
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
                /* This is unavoidable with FTS */
                /* This does a check_property_domain too */
                old_values = get_old_property_values (property, &new_error);
@@ -3092,7 +3092,7 @@ tracker_data_update_statement_with_string (const gchar            *graph,
 #ifndef DISABLE_JOURNAL
        gboolean tried = FALSE;
 #endif
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        GError *new_error = NULL;
 #endif /* HAVE_TRACKER_FTS */
 
@@ -3130,7 +3130,7 @@ tracker_data_update_statement_with_string (const gchar            *graph,
                return;
        }
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        /* This is unavoidable with FTS */
        get_old_property_values (property, &new_error);
        if (new_error) {
@@ -3406,7 +3406,7 @@ tracker_data_commit_transaction (GError **error)
                g_hash_table_remove_all (update_buffer.class_counts);
        }
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        if (update_buffer.fts_ever_updated) {
                update_buffer.fts_ever_updated = FALSE;
        }
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-data/tracker-db-interface-sqlite.c
index 66e6487..3155b59 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.c
+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
@@ -32,7 +32,7 @@
 
 #include <libtracker-sparql/tracker-sparql.h>
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
 #include <libtracker-fts/tracker-fts.h>
 #endif
 
@@ -42,7 +42,7 @@
 #define _UNUSED_PARAMETER_
 #include <unistr.h>
 #include <unicase.h>
-#elif HAVE_LIBICU
+#elif defined(HAVE_LIBICU)
 #include <unicode/utypes.h>
 #include <unicode/uregex.h>
 #include <unicode/ustring.h>
@@ -892,7 +892,7 @@ function_sparql_unaccent (sqlite3_context *context,
        sqlite3_result_text (context, zOutput, written, free);
 }
 
-#elif HAVE_LIBICU
+#elif defined(HAVE_LIBICU)
 
 static void
 function_sparql_lower_case (sqlite3_context *context,
@@ -1612,7 +1612,7 @@ tracker_db_interface_sqlite_fts_init (TrackerDBInterface  *db_interface,
                                       GHashTable          *multivalued,
                                       gboolean             create)
 {
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        GStrv fts_columns;
 
        tracker_fts_init_db (db_interface->db, properties);
@@ -1643,7 +1643,7 @@ tracker_db_interface_sqlite_fts_init (TrackerDBInterface  *db_interface,
 #endif
 }
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
 
 void
 tracker_db_interface_sqlite_fts_alter_table (TrackerDBInterface  *db_interface,
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.h 
b/src/libtracker-data/tracker-db-interface-sqlite.h
index a612296..3986c02 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.h
+++ b/src/libtracker-data/tracker-db-interface-sqlite.h
@@ -47,7 +47,7 @@ void                tracker_db_interface_sqlite_reset_collator         (TrackerD
 void                tracker_db_interface_sqlite_wal_hook               (TrackerDBInterface       *interface,
                                                                         TrackerDBWalCallback      callback);
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
 void                tracker_db_interface_sqlite_fts_alter_table        (TrackerDBInterface       *interface,
                                                                         GHashTable               *properties,
                                                                         GHashTable               
*multivalued);
diff --git a/src/libtracker-data/tracker-db-manager.c b/src/libtracker-data/tracker-db-manager.c
index 67c3c21..0c6b61f 100644
--- a/src/libtracker-data/tracker-db-manager.c
+++ b/src/libtracker-data/tracker-db-manager.c
@@ -36,7 +36,7 @@
 #include <libtracker-common/tracker-common.h>
 #include <libtracker-common/tracker-parser-sha1.h>
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
 #include <libtracker-fts/tracker-fts.h>
 #endif
 
diff --git a/src/tracker/tracker-search.c b/src/tracker/tracker-search.c
index 782d1bb..d41906e 100644
--- a/src/tracker/tracker-search.c
+++ b/src/tracker/tracker-search.c
@@ -197,7 +197,7 @@ static gchar *
 get_fts_string (GStrv    search_words,
                 gboolean use_or_operator)
 {
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        GString *fts;
        gint i, len;
 
@@ -1521,7 +1521,7 @@ search_run (void)
                disable_snippets = TRUE;
        }
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        /* Only check stopwords if FTS is enabled */
        if (terms) {
                TrackerLanguage *language;
diff --git a/tests/libtracker-sparql/tracker-sparql-test.c b/tests/libtracker-sparql/tracker-sparql-test.c
index 5cd4b7a..b9caa15 100644
--- a/tests/libtracker-sparql/tracker-sparql-test.c
+++ b/tests/libtracker-sparql/tracker-sparql-test.c
@@ -40,7 +40,7 @@ ESCAPE_TEST_DATA test_data []  = {
 static TrackerSparqlConnection *connection;
 static GMainLoop *main_loop;
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
 
 static GCancellable *cancellables[6] = { NULL, NULL, NULL, NULL };
 
@@ -121,7 +121,7 @@ test_tracker_sparql_escape_uri_vprintf (void)
        g_free (result);
 }
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
 
 static void test_tracker_sparql_cursor_next_async_query (gint query);
 
@@ -398,7 +398,7 @@ main (gint argc, gchar **argv)
 
        g_test_init (&argc, &argv, NULL);
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        main_loop = g_main_loop_new (NULL, FALSE);
        g_assert (main_loop != NULL);
 #endif
@@ -421,14 +421,14 @@ main (gint argc, gchar **argv)
        g_test_add_func ("/libtracker-sparql/tracker-sparql/tracker_sparql_connection_locking_async",
                         test_tracker_sparql_connection_locking_async);
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        g_test_add_func ("/libtracker-sparql/tracker-sparql/tracker_sparql_cursor_next_async",
                         test_tracker_sparql_cursor_next_async);
 #endif
 
        result = g_test_run ();
 
-#if HAVE_TRACKER_FTS
+#ifdef HAVE_TRACKER_FTS
        g_main_loop_run (main_loop);
 
        if (connection) {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]