[babl/unitybuild: 7/7] Support unity builds: #define/#undef to support macros containing db.
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [babl/unitybuild: 7/7] Support unity builds: #define/#undef to support macros containing db.
- Date: Tue, 27 Feb 2018 14:42:46 +0000 (UTC)
commit c30aef67c2b50f93a4f1da812591de08990b5af2
Author: Félix Piédallu <felix piedallu me>
Date: Tue Feb 27 15:41:07 2018 +0100
Support unity builds: #define/#undef to support macros containing db.
babl/babl-component.c | 2 ++
babl/babl-conversion.c | 2 ++
babl/babl-extension.c | 2 ++
babl/babl-fish.c | 2 ++
babl/babl-format.c | 2 ++
babl/babl-model.c | 2 ++
babl/babl-type.c | 2 ++
7 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/babl/babl-component.c b/babl/babl-component.c
index cc429ef..06d7d2e 100644
--- a/babl/babl-component.c
+++ b/babl/babl-component.c
@@ -23,6 +23,7 @@
#include <stdarg.h>
+#define db db_component
static BablDb *db = NULL;
static Babl *
@@ -144,3 +145,4 @@ babl_component_new (void *first_arg,
}
BABL_CLASS_IMPLEMENT (component)
+#undef db
diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c
index f7c2977..ab9d84d 100644
--- a/babl/babl-conversion.c
+++ b/babl/babl-conversion.c
@@ -25,6 +25,7 @@
#include "babl-db.h"
#include "babl-ref-pixels.h"
+#define db db_conversion
static BablDb *db = NULL;
static int model_is_rgba (const Babl *model)
@@ -540,3 +541,4 @@ const Babl *babl_conversion_get_destination_space (const Babl *conversion)
BABL_CLASS_IMPLEMENT (conversion)
+#undef db
diff --git a/babl/babl-extension.c b/babl/babl-extension.c
index b2b8893..e27ca39 100644
--- a/babl/babl-extension.c
+++ b/babl/babl-extension.c
@@ -35,6 +35,7 @@
static Babl *babl_extension_current_extender = NULL;
+#define db db_extension
static BablDb *db = NULL;
Babl *
@@ -371,3 +372,4 @@ babl_extension_destroy (void *data)
}
BABL_CLASS_IMPLEMENT (extension)
+#undef db
diff --git a/babl/babl-fish.c b/babl/babl-fish.c
index c770e2e..b2732c3 100644
--- a/babl/babl-fish.c
+++ b/babl/babl-fish.c
@@ -35,6 +35,7 @@ typedef struct _BablFindFish
const Babl *destination;
} _BablFishFish;
+#define db db_fish
static BablDb *db = NULL;
static int
@@ -307,3 +308,4 @@ babl_fish (const void *source,
}
BABL_CLASS_MINIMAL_IMPLEMENT (fish);
+#undef db
diff --git a/babl/babl-format.c b/babl/babl-format.c
index 445f883..60851dc 100644
--- a/babl/babl-format.c
+++ b/babl/babl-format.c
@@ -25,6 +25,7 @@
#include "babl-db.h"
#include "babl-ref-pixels.h"
+#define db db_format
static BablDb *db = NULL;
static int babl_format_destruct (void *babl)
@@ -755,3 +756,4 @@ babl_format_exists (const char *name)
return 1;
return 0;
}
+#undef db
diff --git a/babl/babl-model.c b/babl/babl-model.c
index b831651..b49f06d 100644
--- a/babl/babl-model.c
+++ b/babl/babl-model.c
@@ -26,6 +26,7 @@
static const Babl *construct_double_format (const Babl *model);
+#define db db_model
static BablDb *db = NULL;
static int
@@ -406,3 +407,4 @@ babl_model_with_space (const char *name, const Babl *space)
{
return babl_remodel_with_space (babl_model (name), space);
}
+#undef db
diff --git a/babl/babl-type.c b/babl/babl-type.c
index bcff670..db5869e 100644
--- a/babl/babl-type.c
+++ b/babl/babl-type.c
@@ -25,6 +25,7 @@
#include "babl-db.h"
#include "babl-ref-pixels.h"
+#define db db_type
static BablDb *db = NULL;
static int
@@ -238,3 +239,4 @@ babl_type_is_symmetric (const Babl *babl)
}
BABL_CLASS_IMPLEMENT (type)
+#undef db
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]