gir: Use pragma once for the inclusion guard

2024-09-19 08:46:14 +02:00 · 2023-11-07 18:23:17 +00:00 · 2023-11-07 18:23:17 +00:00 · b3dfaf5e97
commit b3dfaf5e97
parent 75800b6b09
25 changed files with 25 additions and 127 deletions
--- a/girepository/giarginfo.h
+++ b/girepository/giarginfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIARGINFO_H__
-#define __GIARGINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -80,5 +79,3 @@ GI_AVAILABLE_IN_ALL
 void                   g_arg_info_load_type              (GIArgInfo *info,
                                                          GITypeInfo *type);
 G_END_DECLS
-
-#endif  /* __GIARGINFO_H__ */
--- a/girepository/gibaseinfo.h
+++ b/girepository/gibaseinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIBASEINFO_H__
-#define __GIBASEINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -100,5 +99,3 @@ GIBaseInfo *           g_info_new                   (GIInfoType    type,
 						     guint32       offset);

 G_END_DECLS
-
-#endif  /* __GIBASEINFO_H__ */
--- a/girepository/gicallableinfo.h
+++ b/girepository/gicallableinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GICALLABLEINFO_H__
-#define __GICALLABLEINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -106,7 +105,3 @@ GI_AVAILABLE_IN_2_42
 GITransfer             g_callable_info_get_instance_ownership_transfer (GICallableInfo *info);

 G_END_DECLS
-
-
-#endif  /* __GICALLABLEINFO_H__ */
-
--- a/girepository/giconstantinfo.h
+++ b/girepository/giconstantinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GICONSTANTINFO_H__
-#define __GICONSTANTINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -54,7 +53,3 @@ GI_AVAILABLE_IN_ALL
 gint         g_constant_info_get_value(GIConstantInfo *info,
 				       GIArgument      *value);
 G_END_DECLS
-
-
-#endif  /* __GICONSTANTINFO_H__ */
-
--- a/girepository/gienuminfo.h
+++ b/girepository/gienuminfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIENUMINFO_H__
-#define __GIENUMINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -78,7 +77,3 @@ GI_AVAILABLE_IN_ALL
 gint64         g_value_info_get_value        (GIValueInfo *info);

 G_END_DECLS
-
-
-#endif  /* __GIENUMINFO_H__ */
-
--- a/girepository/gifieldinfo.h
+++ b/girepository/gifieldinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIFIELDINFO_H__
-#define __GIFIELDINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -67,7 +66,3 @@ gboolean               g_field_info_set_field      (GIFieldInfo     *field_info,
 						    const GIArgument *value);

 G_END_DECLS
-
-
-#endif  /* __GIFIELDINFO_H__ */
-
--- a/girepository/gifunctioninfo.h
+++ b/girepository/gifunctioninfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIFUNCTIONINFO_H__
-#define __GIFUNCTIONINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -96,7 +95,3 @@ gboolean              g_function_info_invoke         (GIFunctionInfo *info,


 G_END_DECLS
-
-
-#endif  /* __GIFUNCTIONINFO_H__ */
-
--- a/girepository/giinterfaceinfo.h
+++ b/girepository/giinterfaceinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIINTERFACEINFO_H__
-#define __GIINTERFACEINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -102,7 +101,3 @@ GI_AVAILABLE_IN_ALL
 GIStructInfo *   g_interface_info_get_iface_struct    (GIInterfaceInfo *info);

 G_END_DECLS
-
-
-#endif  /* __GIINTERFACEINFO_H__ */
-
--- a/girepository/giobjectinfo.h
+++ b/girepository/giobjectinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIOBJECTINFO_H__
-#define __GIOBJECTINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -206,7 +205,3 @@ GIObjectInfoGetValueFunction g_object_info_get_get_value_function_pointer (GIObj


 G_END_DECLS
-
-
-#endif  /* __GIOBJECTINFO_H__ */
-
--- a/girepository/gipropertyinfo.h
+++ b/girepository/gipropertyinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIPROPERTYINFO_H__
-#define __GIPROPERTYINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -59,6 +58,3 @@ GI_AVAILABLE_IN_2_70
 GIFunctionInfo *g_property_info_get_getter (GIPropertyInfo *info);

 G_END_DECLS
-
-#endif  /* __GIPROPERTYINFO_H__ */
-
--- a/girepository/giregisteredtypeinfo.h
+++ b/girepository/giregisteredtypeinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIREGISTEREDTYPEINFO_H__
-#define __GIREGISTEREDTYPEINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -60,7 +59,3 @@ GI_AVAILABLE_IN_ALL
 GType                  g_registered_type_info_get_g_type    (GIRegisteredTypeInfo *info);

 G_END_DECLS
-
-
-#endif  /* __GIREGISTEREDTYPEINFO_H__ */
-
--- a/girepository/girepository-private.h
+++ b/girepository/girepository-private.h
@ -21,8 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIREPOSITORY_PRIVATE_H__
-#define __GIREPOSITORY_PRIVATE_H__
+#pragma once

 #include <ffi.h>
 #include <glib.h>
@ -114,5 +113,3 @@ GIVFuncInfo * _g_base_info_find_vfunc (GIRealInfo   *rinfo,
 				       guint32       offset,
 				       gint          n_vfuncs,
 				       const gchar  *name);
-
-#endif /* __GIREPOSITORY_PRIVATE_H__ */
--- a/girepository/girepository.h
+++ b/girepository/girepository.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __G_IREPOSITORY_H__
-#define __G_IREPOSITORY_H__
+#pragma once

 #include <glib-object.h>
 #include <gmodule.h>
@ -246,7 +245,3 @@ void gi_cclosure_marshal_generic (GClosure       *closure,
                                  gpointer        marshal_data);

 G_END_DECLS
-
-#undef __GIREPOSITORY_H_INSIDE__
-
-#endif  /* __G_IREPOSITORY_H__ */
--- a/girepository/girffi.h
+++ b/girepository/girffi.h
@ -21,8 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIRFFI_H__
-#define __GIRFFI_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -128,5 +127,3 @@ void          g_callable_info_destroy_closure (GICallableInfo       *callable_in
                                               ffi_closure          *closure);

 G_END_DECLS
-
-#endif /* __GIRFFI_H__ */
--- a/girepository/girmodule.h
+++ b/girepository/girmodule.h
@ -21,8 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __G_IR_MODULE_H__
-#define __G_IR_MODULE_H__
+#pragma once

 #include <glib.h>
 #include "gitypelib-internal.h"
@ -84,5 +83,3 @@ void _g_irnode_init_stats (void);
 void _g_irnode_dump_stats (void);

 G_END_DECLS
-
-#endif  /* __G_IR_MODULE_H__ */
--- a/girepository/girnode.h
+++ b/girepository/girnode.h
@ -21,8 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __G_IR_NODE_H__
-#define __G_IR_NODE_H__
+#pragma once

 #include <glib.h>

@ -399,5 +398,3 @@ void _g_ir_node_compute_offsets (GIrTypelibBuild *build,


 G_END_DECLS
-
-#endif  /* __G_IR_NODE_H__ */
--- a/girepository/girparser.h
+++ b/girepository/girparser.h
@ -21,8 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __G_GIR_PARSER_H__
-#define __G_GIR_PARSER_H__
+#pragma once

 #include <glib.h>

@ -48,5 +47,3 @@ GIrModule *_g_ir_parser_parse_file   (GIrParser    *parser,
 				      GError      **error);

 G_END_DECLS
-
-#endif  /* __G_GIR_PARSER_H__ */
--- a/girepository/gisignalinfo.h
+++ b/girepository/gisignalinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GISIGNALINFO_H__
-#define __GISIGNALINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -54,6 +53,3 @@ GI_AVAILABLE_IN_ALL
 gboolean      g_signal_info_true_stops_emit   (GISignalInfo *info);

 G_END_DECLS
-
-
-#endif  /* __GISIGNALINFO_H__ */
--- a/girepository/gistructinfo.h
+++ b/girepository/gistructinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GISTRUCTINFO_H__
-#define __GISTRUCTINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -84,5 +83,3 @@ GI_AVAILABLE_IN_2_76
 const char *     g_struct_info_get_free_function (GIStructInfo *info);

 G_END_DECLS
-
-#endif  /* __GISTRUCTINFO_H__ */
--- a/girepository/gitypeinfo.h
+++ b/girepository/gitypeinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GITYPEINFO_H__
-#define __GITYPEINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -158,7 +157,3 @@ gpointer               gi_type_tag_hash_pointer_from_argument (GITypeTag   stora
                                                               GIArgument *arg);

 G_END_DECLS
-
-
-#endif  /* __GITYPEINFO_H__ */
-
--- a/girepository/gitypelib-internal.h
+++ b/girepository/gitypelib-internal.h
@ -23,8 +23,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __G_TYPELIB_H__
-#define __G_TYPELIB_H__
+#pragma once

 #include <gmodule.h>
 #include "girepository.h"
@ -1349,6 +1348,3 @@ guint16 _gi_typelib_hash_search (guint8* memory, const char *str, guint n_entrie


 G_END_DECLS
-
-#endif  /* __G_TYPELIB_H__ */
-
--- a/girepository/gitypelib.h
+++ b/girepository/gitypelib.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GITYPELIB_H__
-#define __GITYPELIB_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -77,6 +76,3 @@ const gchar * g_typelib_get_namespace         (GITypelib     *typelib);


 G_END_DECLS
-
-#endif  /* __GITYPELIB_H__ */
-
--- a/girepository/gitypes.h
+++ b/girepository/gitypes.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GITYPES_H__
-#define __GITYPES_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -511,5 +510,3 @@ typedef struct _GITypelib GTypelib;
 #endif

 G_END_DECLS
-
-#endif  /* __GITYPES_H__ */
--- a/girepository/giunioninfo.h
+++ b/girepository/giunioninfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIUNIONINFO_H__
-#define __GIUNIONINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -86,7 +85,3 @@ GI_AVAILABLE_IN_2_76
 const char *     g_union_info_get_free_function        (GIUnionInfo *info);

 G_END_DECLS
-
-
-#endif  /* __GIUNIONINFO_H__ */
-
--- a/girepository/givfuncinfo.h
+++ b/girepository/givfuncinfo.h
@ -22,8 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifndef __GIVFUNCINFO_H__
-#define __GIVFUNCINFO_H__
+#pragma once

 #if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
 #error "Only <girepository.h> can be included directly."
@ -70,6 +69,3 @@ gboolean          g_vfunc_info_invoke      (GIVFuncInfo      *info,
                                            GError          **error);

 G_END_DECLS
-
-
-#endif  /* __GIVFUNCINFO_H__ */