mirror of https://gitee.com/openkylin/glib2.0.git
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From: Simon McVittie <smcv@collabora.com>
|
|
Date: Sun, 17 Mar 2024 12:34:09 +0000
|
|
Subject: girparser: Make sizes in integer_aliases more obviously correct
|
|
|
|
We don't actually need to use the Meson-detected size macros here,
|
|
because the result of `sizeof()` is an integer constant expression.
|
|
|
|
No functional change.
|
|
|
|
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
|
Applied-upstream: 2.80.1, commit:31b9c2f589cde93d5829e05543d3a015162b501c
|
|
---
|
|
girepository/girparser.c | 20 ++++++++++----------
|
|
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/girepository/girparser.c b/girepository/girparser.c
|
|
index 9667900..e0cf424 100644
|
|
--- a/girepository/girparser.c
|
|
+++ b/girepository/girparser.c
|
|
@@ -468,16 +468,16 @@ G_STATIC_ASSERT (signedness (int) == 1);
|
|
G_STATIC_ASSERT (signedness (unsigned int) == 0);
|
|
|
|
static IntegerAliasInfo integer_aliases[] = {
|
|
- { "gchar", SIZEOF_CHAR, 1 },
|
|
- { "guchar", SIZEOF_CHAR, 0 },
|
|
- { "gshort", SIZEOF_SHORT, 1 },
|
|
- { "gushort", SIZEOF_SHORT, 0 },
|
|
- { "gint", SIZEOF_INT, 1 },
|
|
- { "guint", SIZEOF_INT, 0 },
|
|
- { "glong", SIZEOF_LONG, 1 },
|
|
- { "gulong", SIZEOF_LONG, 0 },
|
|
- { "gssize", GLIB_SIZEOF_SIZE_T, 1 },
|
|
- { "gsize", GLIB_SIZEOF_SIZE_T, 0 },
|
|
+ { "gchar", sizeof (gchar), 1 },
|
|
+ { "guchar", sizeof (guchar), 0 },
|
|
+ { "gshort", sizeof (gshort), 1 },
|
|
+ { "gushort", sizeof (gushort), 0 },
|
|
+ { "gint", sizeof (gint), 1 },
|
|
+ { "guint", sizeof (guint), 0 },
|
|
+ { "glong", sizeof (glong), 1 },
|
|
+ { "gulong", sizeof (gulong), 0 },
|
|
+ { "gssize", sizeof (gssize), 1 },
|
|
+ { "gsize", sizeof (gsize), 0 },
|
|
{ "gintptr", sizeof (gintptr), 1 },
|
|
{ "guintptr", sizeof (guintptr), 0 },
|
|
#define INTEGER_ALIAS(T) { #T, sizeof (T), signedness (T) }
|