[pango/wip/meson: 3/10] Add prototype for _pango_color_parse_with_alpha()
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/wip/meson: 3/10] Add prototype for _pango_color_parse_with_alpha()
- Date: Fri, 19 May 2017 11:01:59 +0000 (UTC)
commit 779619ad6712fe9e5c4dabfef61e092e7a8f09f0
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed May 17 12:09:14 2017 +0100
Add prototype for _pango_color_parse_with_alpha()
It's used in pango-markup.c and pango-color.c, so it should have an
internally-available prototype, instead of an `extern` declaration at
the point of use.
This also avoids a compiler warning for a missing prototype.
pango/pango-color.c | 1 +
pango/pango-markup.c | 5 -----
pango/pango-utils-internal.h | 20 ++++++++++++--------
3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/pango/pango-color.c b/pango/pango-color.c
index 2f34476..3c37c3d 100644
--- a/pango/pango-color.c
+++ b/pango/pango-color.c
@@ -26,6 +26,7 @@
#include "pango-attributes.h"
#include "pango-impl-utils.h"
+#include "pango-utils-internal.h"
G_DEFINE_BOXED_TYPE (PangoColor, pango_color,
pango_color_copy,
diff --git a/pango/pango-markup.c b/pango/pango-markup.c
index c174736..22bf4fe 100644
--- a/pango/pango-markup.c
+++ b/pango/pango-markup.c
@@ -1000,11 +1000,6 @@ span_parse_boolean (const char *attr_name,
return TRUE;
}
-extern gboolean
-_pango_color_parse_with_alpha (PangoColor *color,
- guint16 *alpha,
- const char *spec);
-
static gboolean
span_parse_color (const char *attr_name,
const char *attr_val,
diff --git a/pango/pango-utils-internal.h b/pango/pango-utils-internal.h
index 6af6ed5..d6e55d7 100644
--- a/pango/pango-utils-internal.h
+++ b/pango/pango-utils-internal.h
@@ -28,16 +28,20 @@
G_BEGIN_DECLS
-gboolean _pango_scan_int (const char **pos,
- int *out);
+gboolean _pango_scan_int (const char **pos,
+ int *out);
-gboolean _pango_parse_enum (GType type,
- const char *str,
- int *value,
- gboolean warn,
- char **possible_values);
+gboolean _pango_parse_enum (GType type,
+ const char *str,
+ int *value,
+ gboolean warn,
+ char **possible_values);
-char *_pango_trim_string (const char *str);
+char *_pango_trim_string (const char *str);
+
+gboolean _pango_color_parse_with_alpha (PangoColor *color,
+ guint16 *alpha,
+ const char *spec);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]