From f4a7efaa2ebf2ea4886c9e0e5f1328ed11f6c8bc Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun, 13 Feb 2022 14:35:53 +0000
Subject: [PATCH] Use GI_TYPE_TAG_IS_BASIC

Now that we have it.
---
 girnode.c   | 6 +++---
 girwriter.c | 2 +-
 gitypelib.c | 2 +-
 gitypes.h   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/girnode.c b/girnode.c
index 4db679d8d..34b7dea81 100644
--- a/girnode.c
+++ b/girnode.c
@@ -632,7 +632,7 @@ _g_ir_node_get_full_size_internal (GIrNode *parent,
       {
 	GIrNodeType *type = (GIrNodeType *)node;
         size = sizeof (SimpleTypeBlob);
-        if (!G_TYPE_TAG_IS_BASIC(type->tag))
+        if (!GI_TYPE_TAG_IS_BASIC (type->tag))
 	  {
 	    g_debug ("node %p type tag '%s'", node,
 		     g_type_tag_to_string (type->tag));
@@ -1208,7 +1208,7 @@ serialize_type (GIrTypelibBuild    *build,
 {
   gint i;
 
-  if (G_TYPE_TAG_IS_BASIC(node->tag))
+  if (GI_TYPE_TAG_IS_BASIC (node->tag))
     {
       g_string_append_printf (str, "%s%s", g_type_tag_to_string (node->tag),
 			      node->is_pointer ? "*" : "");
@@ -1430,7 +1430,7 @@ _g_ir_node_build_typelib (GIrNode         *node,
 
 	*offset += sizeof (SimpleTypeBlob);
 
-	if (G_TYPE_TAG_IS_BASIC (type->tag))
+	if (GI_TYPE_TAG_IS_BASIC (type->tag))
 	  {
 	    blob->flags.reserved = 0;
 	    blob->flags.reserved2 = 0;
diff --git a/girwriter.c b/girwriter.c
index 44e18801f..ea148f320 100644
--- a/girwriter.c
+++ b/girwriter.c
@@ -231,7 +231,7 @@ write_type_info (const gchar *namespace,
 
       xml_end_element (file, "type");
     }
-  else if (G_TYPE_TAG_IS_BASIC (tag))
+  else if (GI_TYPE_TAG_IS_BASIC (tag))
     {
       xml_start_element (file, "type");
       xml_printf (file, " name=\"%s\"", g_type_tag_to_string (tag));
diff --git a/gitypelib.c b/gitypelib.c
index d5ef45064..29349da33 100644
--- a/gitypelib.c
+++ b/gitypelib.c
@@ -792,7 +792,7 @@ validate_type_blob (GITypelib     *typelib,
   if (simple->flags.reserved == 0 &&
       simple->flags.reserved2 == 0)
     {
-      if (!G_TYPE_TAG_IS_BASIC(simple->flags.tag))
+      if (!GI_TYPE_TAG_IS_BASIC(simple->flags.tag))
 	{
 	  g_set_error (error,
 		       G_TYPELIB_ERROR,
diff --git a/gitypes.h b/gitypes.h
index 47b5a3eae..9a9cb1e18 100644
--- a/gitypes.h
+++ b/gitypes.h
@@ -405,7 +405,7 @@ typedef enum {
   GI_TYPE_TAG_GTYPE     = 12,
   GI_TYPE_TAG_UTF8      = 13,
   GI_TYPE_TAG_FILENAME  = 14,
-  /* Non-basic types; compare with G_TYPE_TAG_IS_BASIC */
+  /* Non-basic types; compare with GI_TYPE_TAG_IS_BASIC */
   GI_TYPE_TAG_ARRAY     = 15,  /* container (see GI_TYPE_TAG_IS_CONTAINER) */
   GI_TYPE_TAG_INTERFACE = 16,
   GI_TYPE_TAG_GLIST     = 17,  /* container */