diff --git a/clutter/clutter/cally/cally-actor-private.h b/clutter/clutter/cally/cally-actor-private.h index 23884bb27..55a7d95cb 100644 --- a/clutter/clutter/cally/cally-actor-private.h +++ b/clutter/clutter/cally/cally-actor-private.h @@ -22,8 +22,7 @@ * License along with this library. If not, see . */ -#ifndef __CALLY_ACTOR_PRIVATE_H__ -#define __CALLY_ACTOR_PRIVATE_H__ +#pragma once #include "cally-actor.h" @@ -38,5 +37,3 @@ void _cally_actor_get_top_level_origin (ClutterActor *actor, gint *x, gint *y); - -#endif /* __CALLY_ACTOR_PRIVATE_H__ */ diff --git a/clutter/clutter/cally/cally-actor.h b/clutter/clutter/cally/cally-actor.h index 56ac233b3..34657fa1f 100644 --- a/clutter/clutter/cally/cally-actor.h +++ b/clutter/clutter/cally/cally-actor.h @@ -22,8 +22,7 @@ * License along with this library. If not, see . */ -#ifndef __CALLY_ACTOR_H__ -#define __CALLY_ACTOR_H__ +#pragma once #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -135,5 +134,3 @@ gboolean cally_actor_remove_action_by_name (CallyActor *cally_actor, const gchar *action_name); G_END_DECLS - -#endif /* __CALLY_ACTOR_H__ */ diff --git a/clutter/clutter/cally/cally-clone.h b/clutter/clutter/cally/cally-clone.h index 56f4666aa..3a819d2a5 100644 --- a/clutter/clutter/cally/cally-clone.h +++ b/clutter/clutter/cally/cally-clone.h @@ -18,8 +18,7 @@ * License along with this library. If not, see . */ -#ifndef __CALLY_CLONE_H__ -#define __CALLY_CLONE_H__ +#pragma once #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -67,5 +66,3 @@ CLUTTER_EXPORT AtkObject *cally_clone_new (ClutterActor *actor); G_END_DECLS - -#endif /* __CALLY_CLONE_H__ */ diff --git a/clutter/clutter/cally/cally-factory.h b/clutter/clutter/cally/cally-factory.h index 3af93d0d4..fe7d12d3b 100644 --- a/clutter/clutter/cally/cally-factory.h +++ b/clutter/clutter/cally/cally-factory.h @@ -23,8 +23,7 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _CALLY_FACTORY_H__ -#define _CALLY_FACTORY_H__ +#pragma once #include #include @@ -109,5 +108,3 @@ type_as_function ## _factory_get_type (void) \ atk_registry_set_factory_type (atk_get_default_registry (), \ widget_type, \ type_as_function ## _factory_get_type ()) - -#endif /* _CALLY_FACTORY_H__ */ diff --git a/clutter/clutter/cally/cally-main.h b/clutter/clutter/cally/cally-main.h index 07d668b03..ce50513a0 100644 --- a/clutter/clutter/cally/cally-main.h +++ b/clutter/clutter/cally/cally-main.h @@ -22,8 +22,7 @@ * License along with this library. If not, see . */ -#ifndef __CALLY_MAIN_H__ -#define __CALLY_MAIN_H__ +#pragma once #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -40,5 +39,3 @@ CLUTTER_EXPORT gboolean cally_accessibility_init (void); G_END_DECLS - -#endif /* __CALLY_MAIN_H__ */ diff --git a/clutter/clutter/cally/cally-root.h b/clutter/clutter/cally/cally-root.h index 8c5e81b5c..bbf080683 100644 --- a/clutter/clutter/cally/cally-root.h +++ b/clutter/clutter/cally/cally-root.h @@ -18,8 +18,7 @@ * License along with this library. If not, see . */ -#ifndef __CALLY_ROOT_H__ -#define __CALLY_ROOT_H__ +#pragma once #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -67,5 +66,3 @@ CLUTTER_EXPORT AtkObject *cally_root_new (void); G_END_DECLS - -#endif /* __CALLY_ROOT_H__ */ diff --git a/clutter/clutter/cally/cally-stage.h b/clutter/clutter/cally/cally-stage.h index 95ad89e4d..e78c9e5a2 100644 --- a/clutter/clutter/cally/cally-stage.h +++ b/clutter/clutter/cally/cally-stage.h @@ -18,8 +18,7 @@ * License along with this library. If not, see . */ -#ifndef __CALLY_STAGE_H__ -#define __CALLY_STAGE_H__ +#pragma once #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -67,5 +66,3 @@ CLUTTER_EXPORT AtkObject *cally_stage_new (ClutterActor *actor); G_END_DECLS - -#endif /* __CALLY_STAGE_H__ */ diff --git a/clutter/clutter/cally/cally-text.h b/clutter/clutter/cally/cally-text.h index 7a4af4d71..11f8ce85c 100644 --- a/clutter/clutter/cally/cally-text.h +++ b/clutter/clutter/cally/cally-text.h @@ -18,8 +18,7 @@ * License along with this library. If not, see . */ -#ifndef __CALLY_TEXT_H__ -#define __CALLY_TEXT_H__ +#pragma once #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -67,5 +66,3 @@ CLUTTER_EXPORT AtkObject* cally_text_new (ClutterActor *actor); G_END_DECLS - -#endif /* __CALLY_TEXT_H__ */ diff --git a/clutter/clutter/cally/cally-util.h b/clutter/clutter/cally/cally-util.h index faa5d8420..756d2a64d 100644 --- a/clutter/clutter/cally/cally-util.h +++ b/clutter/clutter/cally/cally-util.h @@ -18,8 +18,7 @@ * License along with this library. If not, see . */ -#ifndef __CALLY_UTIL_H__ -#define __CALLY_UTIL_H__ +#pragma once #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -69,5 +68,3 @@ void _cally_util_override_atk_util (void); gboolean cally_snoop_key_event (ClutterKeyEvent *key); G_END_DECLS - -#endif /* __CALLY_UTIL_H__ */ diff --git a/clutter/clutter/cally/cally.h b/clutter/clutter/cally/cally.h index 98c3a4499..0305f1dab 100644 --- a/clutter/clutter/cally/cally.h +++ b/clutter/clutter/cally/cally.h @@ -18,8 +18,7 @@ * License along with this library. If not, see . */ -#ifndef __CALLY_H__ -#define __CALLY_H__ +#pragma once #define __CALLY_H_INSIDE__ @@ -33,5 +32,3 @@ #include "cally-util.h" #undef __CALLY_H_INSIDE__ - -#endif /* __CALLY_H__ */ diff --git a/clutter/clutter/clutter-action-private.h b/clutter/clutter/clutter-action-private.h index 97a1e6395..9bf59a4ee 100644 --- a/clutter/clutter/clutter-action-private.h +++ b/clutter/clutter/clutter-action-private.h @@ -22,8 +22,7 @@ * Carlos Garnacho */ -#ifndef CLUTTER_ACTION_PRIVATE_H -#define CLUTTER_ACTION_PRIVATE_H +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -44,5 +43,3 @@ void clutter_action_sequence_cancelled (ClutterAction *action, ClutterEventSequence *sequence); G_END_DECLS - -#endif /* CLUTTER_ACTION_PRIVATE_H */ diff --git a/clutter/clutter/clutter-action.h b/clutter/clutter/clutter-action.h index 73e618b40..c9f19cfa7 100644 --- a/clutter/clutter/clutter-action.h +++ b/clutter/clutter/clutter-action.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_ACTION_H__ -#define __CLUTTER_ACTION_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -90,5 +89,3 @@ gboolean clutter_actor_has_actions (ClutterActor *self); ClutterEventPhase clutter_action_get_phase (ClutterAction *action); G_END_DECLS - -#endif /* __CLUTTER_ACTION_H__ */ diff --git a/clutter/clutter/clutter-actor-box-private.h b/clutter/clutter/clutter-actor-box-private.h index e7aeb8857..6611e25cd 100644 --- a/clutter/clutter/clutter-actor-box-private.h +++ b/clutter/clutter/clutter-actor-box-private.h @@ -1,5 +1,4 @@ -#ifndef __CLUTTER_ACTOR_BOX_PRIVATE_H__ -#define __CLUTTER_ACTOR_BOX_PRIVATE_H__ +#pragma once #include @@ -8,5 +7,3 @@ G_BEGIN_DECLS void _clutter_actor_box_enlarge_for_effects (ClutterActorBox *box); G_END_DECLS - -#endif /* __CLUTTER_ACTOR_BOX_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-actor-meta-private.h b/clutter/clutter/clutter-actor-meta-private.h index 661c352a5..386b78731 100644 --- a/clutter/clutter/clutter-actor-meta-private.h +++ b/clutter/clutter/clutter-actor-meta-private.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_ACTOR_META_PRIVATE_H__ -#define __CLUTTER_ACTOR_META_PRIVATE_H__ +#pragma once #include @@ -93,5 +92,3 @@ int _clutter_actor_meta_get_priority (ClutterActorMet gboolean _clutter_actor_meta_is_internal (ClutterActorMeta *meta); G_END_DECLS - -#endif /* __CLUTTER_ACTOR_META_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-actor-meta.h b/clutter/clutter/clutter-actor-meta.h index e02a8ba2f..865bf8bbf 100644 --- a/clutter/clutter/clutter-actor-meta.h +++ b/clutter/clutter/clutter-actor-meta.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_ACTOR_META_H__ -#define __CLUTTER_ACTOR_META_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -86,5 +85,3 @@ CLUTTER_EXPORT ClutterActor * clutter_actor_meta_get_actor (ClutterActorMeta *meta); G_END_DECLS - -#endif /* __CLUTTER_ACTOR_META_H__ */ diff --git a/clutter/clutter/clutter-actor-private.h b/clutter/clutter/clutter-actor-private.h index a2b4b9f74..0c10a41f7 100644 --- a/clutter/clutter/clutter-actor-private.h +++ b/clutter/clutter/clutter-actor-private.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_ACTOR_PRIVATE_H__ -#define __CLUTTER_ACTOR_PRIVATE_H__ +#pragma once #include #include @@ -281,5 +280,3 @@ void clutter_actor_set_implicitly_grabbed (ClutterActor *actor, gboolean is_implicitly_grabbed); G_END_DECLS - -#endif /* __CLUTTER_ACTOR_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-actor.h b/clutter/clutter/clutter-actor.h index 8070b17fe..af9bbb50f 100644 --- a/clutter/clutter/clutter-actor.h +++ b/clutter/clutter/clutter-actor.h @@ -22,8 +22,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_ACTOR_H__ -#define __CLUTTER_ACTOR_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -909,5 +908,3 @@ CLUTTER_EXPORT void clutter_actor_invalidate_paint_volume (ClutterActor *self); G_END_DECLS - -#endif /* __CLUTTER_ACTOR_H__ */ diff --git a/clutter/clutter/clutter-align-constraint.h b/clutter/clutter/clutter-align-constraint.h index 8bf26c3b9..f1af47ac8 100644 --- a/clutter/clutter/clutter-align-constraint.h +++ b/clutter/clutter/clutter-align-constraint.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_ALIGN_CONSTRAINT_H__ -#define __CLUTTER_ALIGN_CONSTRAINT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -71,5 +70,3 @@ CLUTTER_EXPORT gfloat clutter_align_constraint_get_factor (ClutterAlignConstraint *align); G_END_DECLS - -#endif /* __CLUTTER_ALIGN_CONSTRAINT_H__ */ diff --git a/clutter/clutter/clutter-animatable.h b/clutter/clutter/clutter-animatable.h index 9e18d3e35..b4c9cdd3d 100644 --- a/clutter/clutter/clutter-animatable.h +++ b/clutter/clutter/clutter-animatable.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_ANIMATABLE_H__ -#define __CLUTTER_ANIMATABLE_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -96,5 +95,3 @@ CLUTTER_EXPORT ClutterActor * clutter_animatable_get_actor (ClutterAnimatable *animatable); G_END_DECLS - -#endif /* __CLUTTER_ANIMATABLE_H__ */ diff --git a/clutter/clutter/clutter-autocleanups.h b/clutter/clutter/clutter-autocleanups.h index 9c44f0d23..e1d7f9e32 100644 --- a/clutter/clutter/clutter-autocleanups.h +++ b/clutter/clutter/clutter-autocleanups.h @@ -21,8 +21,7 @@ * */ -#ifndef __CLUTTER_AUTO_CLEANUPS_H__ -#define __CLUTTER_AUTO_CLEANUPS_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -88,5 +87,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintVolume, clutter_paint_volume_free) G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPathNode, clutter_path_node_free) #endif /* __GI_SCANNER__ */ - -#endif /* __CLUTTER_AUTO_CLEANUPS_H__ */ diff --git a/clutter/clutter/clutter-backend-private.h b/clutter/clutter/clutter-backend-private.h index 95e992ac0..5ae1062eb 100644 --- a/clutter/clutter/clutter-backend-private.h +++ b/clutter/clutter/clutter-backend-private.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_BACKEND_PRIVATE_H__ -#define __CLUTTER_BACKEND_PRIVATE_H__ +#pragma once #include #include @@ -129,5 +128,3 @@ CLUTTER_EXPORT void clutter_backend_destroy (ClutterBackend *backend); G_END_DECLS - -#endif /* __CLUTTER_BACKEND_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-backend.h b/clutter/clutter/clutter-backend.h index 117fdc0fb..779562c40 100644 --- a/clutter/clutter/clutter-backend.h +++ b/clutter/clutter/clutter-backend.h @@ -21,8 +21,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_BACKEND_H__ -#define __CLUTTER_BACKEND_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -74,5 +73,3 @@ CLUTTER_EXPORT ClutterSeat * clutter_backend_get_default_seat (ClutterBackend *backend); G_END_DECLS - -#endif /* __CLUTTER_BACKEND_H__ */ diff --git a/clutter/clutter/clutter-bezier.h b/clutter/clutter/clutter-bezier.h index a58c589c2..357b868f3 100644 --- a/clutter/clutter/clutter-bezier.h +++ b/clutter/clutter/clutter-bezier.h @@ -21,8 +21,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_BEZIER_H__ -#define __CLUTTER_BEZIER_H__ +#pragma once #include #include "clutter-types.h" @@ -61,5 +60,3 @@ void _clutter_bezier_adjust (ClutterBezier *b, guint _clutter_bezier_get_length (const ClutterBezier *b); G_END_DECLS - -#endif /* __CLUTTER_BEZIER_H__ */ diff --git a/clutter/clutter/clutter-bin-layout.h b/clutter/clutter/clutter-bin-layout.h index 6474c8dcc..34bebcbe6 100644 --- a/clutter/clutter/clutter-bin-layout.h +++ b/clutter/clutter/clutter-bin-layout.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_BIN_LAYOUT_H__ -#define __CLUTTER_BIN_LAYOUT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -72,5 +71,3 @@ ClutterLayoutManager * clutter_bin_layout_new (ClutterBinAlignment x_align, ClutterBinAlignment y_align); G_END_DECLS - -#endif /* __CLUTTER_BIN_LAYOUT_H__ */ diff --git a/clutter/clutter/clutter-bind-constraint.h b/clutter/clutter/clutter-bind-constraint.h index 319407ad7..2f3de8183 100644 --- a/clutter/clutter/clutter-bind-constraint.h +++ b/clutter/clutter/clutter-bind-constraint.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_BIND_CONSTRAINT_H__ -#define __CLUTTER_BIND_CONSTRAINT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -65,5 +64,3 @@ CLUTTER_EXPORT gfloat clutter_bind_constraint_get_offset (ClutterBindConstraint *constraint); G_END_DECLS - -#endif /* __CLUTTER_BIND_CONSTRAINT_H__ */ diff --git a/clutter/clutter/clutter-binding-pool.h b/clutter/clutter/clutter-binding-pool.h index 6d9337dc9..937569572 100644 --- a/clutter/clutter/clutter-binding-pool.h +++ b/clutter/clutter/clutter-binding-pool.h @@ -21,8 +21,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_BINDING_POOL_H__ -#define __CLUTTER_BINDING_POOL_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -121,5 +120,3 @@ void clutter_binding_pool_unblock_action (ClutterBindingPool const gchar *action_name); G_END_DECLS - -#endif /* __CLUTTER_BINDING_POOL_H__ */ diff --git a/clutter/clutter/clutter-blur-effect.h b/clutter/clutter/clutter-blur-effect.h index 7096a0ac3..8748f807c 100644 --- a/clutter/clutter/clutter-blur-effect.h +++ b/clutter/clutter/clutter-blur-effect.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_BLUR_EFFECT_H__ -#define __CLUTTER_BLUR_EFFECT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -47,5 +46,3 @@ CLUTTER_EXPORT ClutterEffect *clutter_blur_effect_new (void); G_END_DECLS - -#endif /* __CLUTTER_BLUR_EFFECT_H__ */ diff --git a/clutter/clutter/clutter-blur-private.h b/clutter/clutter/clutter-blur-private.h index cf7cfd2f5..f9a0c6d3a 100644 --- a/clutter/clutter/clutter-blur-private.h +++ b/clutter/clutter/clutter-blur-private.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_BLUR_PRIVATE_H -#define CLUTTER_BLUR_PRIVATE_H +#pragma once #include @@ -36,5 +35,3 @@ CoglTexture * clutter_blur_get_texture (ClutterBlur *blur); void clutter_blur_free (ClutterBlur *blur); G_END_DECLS - -#endif /* CLUTTER_BLUR_PRIVATE_H */ diff --git a/clutter/clutter/clutter-box-layout.h b/clutter/clutter/clutter-box-layout.h index a89f4a162..67f2d8898 100644 --- a/clutter/clutter/clutter-box-layout.h +++ b/clutter/clutter/clutter-box-layout.h @@ -25,8 +25,7 @@ * Thomas Wood */ -#ifndef __CLUTTER_BOX_LAYOUT_H__ -#define __CLUTTER_BOX_LAYOUT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -91,5 +90,3 @@ CLUTTER_EXPORT gboolean clutter_box_layout_get_homogeneous (ClutterBoxLayout *layout); G_END_DECLS - -#endif /* __CLUTTER_BOX_LAYOUT_H__ */ diff --git a/clutter/clutter/clutter-brightness-contrast-effect.h b/clutter/clutter/clutter-brightness-contrast-effect.h index 3e69e2615..e2d3aabb9 100644 --- a/clutter/clutter/clutter-brightness-contrast-effect.h +++ b/clutter/clutter/clutter-brightness-contrast-effect.h @@ -22,8 +22,7 @@ * Joseph Scheuhammer */ -#ifndef __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__ -#define __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -76,5 +75,3 @@ void clutter_brightness_contrast_effect_get_contrast float *blue); G_END_DECLS - -#endif /* __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__ */ diff --git a/clutter/clutter/clutter-cairo.h b/clutter/clutter/clutter-cairo.h index fe4b71c95..3e4a14929 100644 --- a/clutter/clutter/clutter-cairo.h +++ b/clutter/clutter/clutter-cairo.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_CAIRO_H__ -#define __CLUTTER_CAIRO_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -55,5 +54,3 @@ void clutter_cairo_set_source_color (cairo_t *cr, const ClutterColor *color); G_END_DECLS - -#endif /* __CLUTTER_CAIRO_H__ */ diff --git a/clutter/clutter/clutter-canvas.h b/clutter/clutter/clutter-canvas.h index 055b1fdd8..4352cf67e 100644 --- a/clutter/clutter/clutter-canvas.h +++ b/clutter/clutter/clutter-canvas.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_CANVAS_H__ -#define __CLUTTER_CANVAS_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -88,5 +87,3 @@ CLUTTER_EXPORT float clutter_canvas_get_scale_factor (ClutterCanvas *canvas); G_END_DECLS - -#endif /* __CLUTTER_CANVAS_H__ */ diff --git a/clutter/clutter/clutter-child-meta.h b/clutter/clutter/clutter-child-meta.h index b49204c31..b2fcb626f 100644 --- a/clutter/clutter/clutter-child-meta.h +++ b/clutter/clutter/clutter-child-meta.h @@ -25,8 +25,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_CHILD_META_H__ -#define __CLUTTER_CHILD_META_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -76,5 +75,3 @@ CLUTTER_EXPORT ClutterActor * clutter_child_meta_get_actor (ClutterChildMeta *data); G_END_DECLS - -#endif /* __CLUTTER_CHILD_META_H__ */ diff --git a/clutter/clutter/clutter-click-action.h b/clutter/clutter/clutter-click-action.h index 1cf5503b0..e9ab2441d 100644 --- a/clutter/clutter/clutter-click-action.h +++ b/clutter/clutter/clutter-click-action.h @@ -25,8 +25,7 @@ * Colin Walters */ -#ifndef __CLUTTER_CLICK_ACTION_H__ -#define __CLUTTER_CLICK_ACTION_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -83,5 +82,3 @@ CLUTTER_EXPORT void clutter_click_action_release (ClutterClickAction *action); G_END_DECLS - -#endif /* __CLUTTER_CLICK_ACTION_H__ */ diff --git a/clutter/clutter/clutter-clone.h b/clutter/clutter/clutter-clone.h index 8ff1020c5..9e36ededa 100644 --- a/clutter/clutter/clutter-clone.h +++ b/clutter/clutter/clutter-clone.h @@ -21,8 +21,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_CLONE_H__ -#define __CLUTTER_CLONE_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -74,5 +73,3 @@ CLUTTER_EXPORT ClutterActor * clutter_clone_get_source (ClutterClone *self); G_END_DECLS - -#endif /* __CLUTTER_CLONE_H__ */ diff --git a/clutter/clutter/clutter-color-state.h b/clutter/clutter/clutter-color-state.h index 5046253cd..9497b2824 100644 --- a/clutter/clutter/clutter-color-state.h +++ b/clutter/clutter/clutter-color-state.h @@ -22,8 +22,7 @@ * Naveen Kumar */ -#ifndef CLUTTER_COLOR_STATE_H -#define CLUTTER_COLOR_STATE_H +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -46,5 +45,3 @@ CLUTTER_EXPORT ClutterColorspace clutter_color_state_get_colorspace (ClutterColorState *color_state); G_END_DECLS - -#endif /* CLUTTER_COLOR_STATE_H */ diff --git a/clutter/clutter/clutter-color-static.h b/clutter/clutter/clutter-color-static.h index 766864c88..fa3f16cfc 100644 --- a/clutter/clutter/clutter-color-static.h +++ b/clutter/clutter/clutter-color-static.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_COLOR_STATIC_H__ -#define __CLUTTER_COLOR_STATIC_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -75,5 +74,3 @@ #define CLUTTER_COLOR_Aluminium6 (__CLUTTER_COLOR_SYM (ALUMINIUM_6)) #define CLUTTER_COLOR_Transparent (__CLUTTER_COLOR_SYM (TRANSPARENT)) - -#endif /* __CLUTTER_COLOR_STATIC_H__ */ diff --git a/clutter/clutter/clutter-color.h b/clutter/clutter/clutter-color.h index 99ef088a5..054eecac2 100644 --- a/clutter/clutter/clutter-color.h +++ b/clutter/clutter/clutter-color.h @@ -23,8 +23,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_COLOR_H__ -#define __CLUTTER_COLOR_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -195,5 +194,3 @@ CLUTTER_EXPORT const ClutterColor *clutter_color_get_static (ClutterStaticColor color); G_END_DECLS - -#endif /* __CLUTTER_COLOR_H__ */ diff --git a/clutter/clutter/clutter-colorize-effect.h b/clutter/clutter/clutter-colorize-effect.h index 817d58a77..ba8b56cdc 100644 --- a/clutter/clutter/clutter-colorize-effect.h +++ b/clutter/clutter/clutter-colorize-effect.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_COLORIZE_EFFECT_H__ -#define __CLUTTER_COLORIZE_EFFECT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -55,5 +54,3 @@ void clutter_colorize_effect_get_tint (ClutterColorizeEffect *effect, ClutterColor *tint); G_END_DECLS - -#endif /* __CLUTTER_COLORIZE_EFFECT_H__ */ diff --git a/clutter/clutter/clutter-constraint-private.h b/clutter/clutter/clutter-constraint-private.h index 5fbddef00..1a0774a05 100644 --- a/clutter/clutter/clutter-constraint-private.h +++ b/clutter/clutter/clutter-constraint-private.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_CONSTRAINT_PRIVATE_H__ -#define __CLUTTER_CONSTRAINT_PRIVATE_H__ +#pragma once #include "clutter-constraint.h" @@ -31,5 +30,3 @@ gboolean clutter_constraint_update_allocation (ClutterConstraint *constraint, ClutterActorBox *allocation); G_END_DECLS - -#endif /* __CLUTTER_CONSTRAINT_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-constraint.h b/clutter/clutter/clutter-constraint.h index 1799795f9..86f374932 100644 --- a/clutter/clutter/clutter-constraint.h +++ b/clutter/clutter/clutter-constraint.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_CONSTRAINT_H__ -#define __CLUTTER_CONSTRAINT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -114,5 +113,3 @@ CLUTTER_EXPORT gboolean clutter_actor_has_constraints (ClutterActor *self); G_END_DECLS - -#endif /* __CLUTTER_CONSTRAINT_H__ */ diff --git a/clutter/clutter/clutter-container-private.h b/clutter/clutter/clutter-container-private.h index d619a6531..a029a39fe 100644 --- a/clutter/clutter/clutter-container-private.h +++ b/clutter/clutter/clutter-container-private.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_CONTAINER_PRIVATE_H__ -#define __CLUTTER_CONTAINER_PRIVATE_H__ +#pragma once #include @@ -32,5 +31,3 @@ void _clutter_container_emit_actor_removed (ClutterContainer *container, ClutterActor *actor); G_END_DECLS - -#endif /* __CLUTTER_CONTAINER_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-container.h b/clutter/clutter/clutter-container.h index 14431fef7..0beac7730 100644 --- a/clutter/clutter/clutter-container.h +++ b/clutter/clutter/clutter-container.h @@ -24,8 +24,7 @@ * Author: Emmanuele Bassi */ -#ifndef __CLUTTER_CONTAINER_H__ -#define __CLUTTER_CONTAINER_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -150,5 +149,3 @@ void clutter_container_child_notify (Clutter GParamSpec *pspec); G_END_DECLS - -#endif /* __CLUTTER_CONTAINER_H__ */ diff --git a/clutter/clutter/clutter-content-private.h b/clutter/clutter/clutter-content-private.h index 1654b3bbf..b6922ed27 100644 --- a/clutter/clutter/clutter-content-private.h +++ b/clutter/clutter/clutter-content-private.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_CONTENT_PRIVATE_H__ -#define __CLUTTER_CONTENT_PRIVATE_H__ +#pragma once #include @@ -40,5 +39,3 @@ void _clutter_content_paint_content (ClutterContent *co ClutterPaintContext *paint_context); G_END_DECLS - -#endif /* __CLUTTER_CONTENT_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-content.h b/clutter/clutter/clutter-content.h index 2118858e1..f03c96aa0 100644 --- a/clutter/clutter/clutter-content.h +++ b/clutter/clutter/clutter-content.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_CONTENT_H__ -#define __CLUTTER_CONTENT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -89,5 +88,3 @@ CLUTTER_EXPORT void clutter_content_invalidate_size (ClutterContent *content); G_END_DECLS - -#endif /* __CLUTTER_CONTENT_H__ */ diff --git a/clutter/clutter/clutter-damage-history.h b/clutter/clutter/clutter-damage-history.h index b249d2e17..33b296254 100644 --- a/clutter/clutter/clutter-damage-history.h +++ b/clutter/clutter/clutter-damage-history.h @@ -16,8 +16,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_DAMAGE_HISTORY_H -#define CLUTTER_DAMAGE_HISTORY_H +#pragma once #include #include @@ -46,5 +45,3 @@ void clutter_damage_history_step (ClutterDamageHistory *history); CLUTTER_EXPORT const cairo_region_t * clutter_damage_history_lookup (ClutterDamageHistory *history, int age); - -#endif /* CLUTTER_DAMAGE_HISTORY_H */ diff --git a/clutter/clutter/clutter-debug.h b/clutter/clutter/clutter-debug.h index 9d0c685ed..0db609e05 100644 --- a/clutter/clutter/clutter-debug.h +++ b/clutter/clutter/clutter-debug.h @@ -1,5 +1,4 @@ -#ifndef __CLUTTER_DEBUG_H__ -#define __CLUTTER_DEBUG_H__ +#pragma once #include #include "clutter-main.h" @@ -49,5 +48,3 @@ void _clutter_debug_message (const char *format, ...) G_GNUC_PRINTF (1, 2); G_END_DECLS - -#endif /* __CLUTTER_DEBUG_H__ */ diff --git a/clutter/clutter/clutter-deform-effect.h b/clutter/clutter/clutter-deform-effect.h index 74534d979..7a58e1a72 100644 --- a/clutter/clutter/clutter-deform-effect.h +++ b/clutter/clutter/clutter-deform-effect.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_DEFORM_EFFECT_H__ -#define __CLUTTER_DEFORM_EFFECT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -94,5 +93,3 @@ CLUTTER_EXPORT void clutter_deform_effect_invalidate (ClutterDeformEffect *effect); G_END_DECLS - -#endif /* __CLUTTER_DEFORM_EFFECT_H__ */ diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h index 8d790660c..788673ef3 100644 --- a/clutter/clutter/clutter-deprecated.h +++ b/clutter/clutter/clutter-deprecated.h @@ -1,5 +1,4 @@ -#ifndef __CLUTTER_DEPRECATED_H__ -#define __CLUTTER_DEPRECATED_H__ +#pragma once #define __CLUTTER_DEPRECATED_H_INSIDE__ @@ -7,4 +6,3 @@ #undef __CLUTTER_DEPRECATED_H_INSIDE__ -#endif /* __CLUTTER_DEPRECATED_H__ */ diff --git a/clutter/clutter/clutter-desaturate-effect.h b/clutter/clutter/clutter-desaturate-effect.h index f4c17b1dc..4b940bd2b 100644 --- a/clutter/clutter/clutter-desaturate-effect.h +++ b/clutter/clutter/clutter-desaturate-effect.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_DESATURATE_EFFECT_H__ -#define __CLUTTER_DESATURATE_EFFECT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -53,5 +52,3 @@ CLUTTER_EXPORT gdouble clutter_desaturate_effect_get_factor (ClutterDesaturateEffect *effect); G_END_DECLS - -#endif /* __CLUTTER_DESATURATE_EFFECT_H__ */ diff --git a/clutter/clutter/clutter-easing.h b/clutter/clutter/clutter-easing.h index f7e6dccfb..65c6a5d56 100644 --- a/clutter/clutter/clutter-easing.h +++ b/clutter/clutter/clutter-easing.h @@ -1,5 +1,4 @@ -#ifndef __CLUTTER_EASING_H__ -#define __CLUTTER_EASING_H__ +#pragma once #include @@ -138,5 +137,3 @@ double clutter_ease_cubic_bezier (double t, double y_2); G_END_DECLS - -#endif /* __CLUTTER_EASING_H__ */ diff --git a/clutter/clutter/clutter-effect-private.h b/clutter/clutter/clutter-effect-private.h index 85a32552f..e117a6d3a 100644 --- a/clutter/clutter/clutter-effect-private.h +++ b/clutter/clutter/clutter-effect-private.h @@ -1,5 +1,4 @@ -#ifndef __CLUTTER_EFFECT_PRIVATE_H__ -#define __CLUTTER_EFFECT_PRIVATE_H__ +#pragma once #include @@ -16,5 +15,3 @@ void _clutter_effect_pick (ClutterEffect ClutterPickContext *pick_context); G_END_DECLS - -#endif /* __CLUTTER_EFFECT_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-effect.h b/clutter/clutter/clutter-effect.h index f3cbde99f..8dd11f5f5 100644 --- a/clutter/clutter/clutter-effect.h +++ b/clutter/clutter/clutter-effect.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_EFFECT_H__ -#define __CLUTTER_EFFECT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -123,5 +122,3 @@ CLUTTER_EXPORT gboolean clutter_actor_has_effects (ClutterActor *self); G_END_DECLS - -#endif /* __CLUTTER_EFFECT_H__ */ diff --git a/clutter/clutter/clutter-enum-types.h.in b/clutter/clutter/clutter-enum-types.h.in index 17f9ee644..569a764ba 100644 --- a/clutter/clutter/clutter-enum-types.h.in +++ b/clutter/clutter/clutter-enum-types.h.in @@ -1,6 +1,5 @@ /*** BEGIN file-header ***/ -#ifndef __CLUTTER_ENUM_TYPES_H__ -#define __CLUTTER_ENUM_TYPES_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -25,5 +24,4 @@ CLUTTER_EXPORT GType @enum_name@_get_type (void) G_GNUC_CONST; /*** BEGIN file-tail ***/ G_END_DECLS -#endif /* !__CLUTTER_ENUM_TYPES_H__ */ /*** END file-tail ***/ diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h index d13a55124..43386366c 100644 --- a/clutter/clutter/clutter-enums.h +++ b/clutter/clutter/clutter-enums.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_ENUMS_H__ -#define __CLUTTER_ENUMS_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -1471,5 +1470,3 @@ typedef enum } ClutterGrabState; G_END_DECLS - -#endif /* __CLUTTER_ENUMS_H__ */ diff --git a/clutter/clutter/clutter-event-private.h b/clutter/clutter/clutter-event-private.h index dcee65a8e..cb89421a3 100644 --- a/clutter/clutter/clutter-event-private.h +++ b/clutter/clutter/clutter-event-private.h @@ -1,5 +1,4 @@ -#ifndef __CLUTTER_EVENT_PRIVATE_H__ -#define __CLUTTER_EVENT_PRIVATE_H__ +#pragma once #include @@ -42,5 +41,3 @@ CLUTTER_EXPORT const char * clutter_event_get_name (const ClutterEvent *event); G_END_DECLS - -#endif /* __CLUTTER_EVENT_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-event.h b/clutter/clutter/clutter-event.h index 1efbce325..dbb8167e1 100644 --- a/clutter/clutter/clutter-event.h +++ b/clutter/clutter/clutter-event.h @@ -21,8 +21,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_EVENT_H__ -#define __CLUTTER_EVENT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -817,5 +816,3 @@ gboolean clutter_event_get_relative_motion (const ClutterEvent * G_END_DECLS - -#endif /* __CLUTTER_EVENT_H__ */ diff --git a/clutter/clutter/clutter-fixed-layout.h b/clutter/clutter/clutter-fixed-layout.h index 8aa01dfcb..095acfa5a 100644 --- a/clutter/clutter/clutter-fixed-layout.h +++ b/clutter/clutter/clutter-fixed-layout.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_FIXED_LAYOUT_H__ -#define __CLUTTER_FIXED_LAYOUT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -68,5 +67,3 @@ CLUTTER_EXPORT ClutterLayoutManager *clutter_fixed_layout_new (void); G_END_DECLS - -#endif /* __CLUTTER_FIXED_LAYOUT_H__ */ diff --git a/clutter/clutter/clutter-flatten-effect.h b/clutter/clutter/clutter-flatten-effect.h index 03b2df6eb..c38f60102 100644 --- a/clutter/clutter/clutter-flatten-effect.h +++ b/clutter/clutter/clutter-flatten-effect.h @@ -22,8 +22,7 @@ * Neil Roberts */ -#ifndef __CLUTTER_FLATTEN_EFFECT_H__ -#define __CLUTTER_FLATTEN_EFFECT_H__ +#pragma once #include @@ -69,5 +68,3 @@ GType _clutter_flatten_effect_get_type (void) G_GNUC_CONST; ClutterEffect *_clutter_flatten_effect_new (void); G_END_DECLS - -#endif /* __CLUTTER_FLATTEN_EFFECT_H__ */ diff --git a/clutter/clutter/clutter-flow-layout.h b/clutter/clutter/clutter-flow-layout.h index a1de4684f..42d2be399 100644 --- a/clutter/clutter/clutter-flow-layout.h +++ b/clutter/clutter/clutter-flow-layout.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_FLOW_LAYOUT_H__ -#define __CLUTTER_FLOW_LAYOUT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -115,5 +114,3 @@ CLUTTER_EXPORT gboolean clutter_flow_layout_get_snap_to_grid (ClutterFlowLayout *layout); G_END_DECLS - -#endif /* __CLUTTER_FLOW_LAYOUT_H__ */ diff --git a/clutter/clutter/clutter-frame-clock.h b/clutter/clutter/clutter-frame-clock.h index 6fd5de47a..93ebc9438 100644 --- a/clutter/clutter/clutter-frame-clock.h +++ b/clutter/clutter/clutter-frame-clock.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_FRAME_CLOCK_H -#define CLUTTER_FRAME_CLOCK_H +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -96,5 +95,3 @@ void clutter_frame_clock_record_flip_time (ClutterFrameClock *frame_clock, int64_t flip_time_us); GString * clutter_frame_clock_get_max_render_time_debug_info (ClutterFrameClock *frame_clock); - -#endif /* CLUTTER_FRAME_CLOCK_H */ diff --git a/clutter/clutter/clutter-frame-private.h b/clutter/clutter/clutter-frame-private.h index 1eceb8bc0..0a0226b0a 100644 --- a/clutter/clutter/clutter-frame-private.h +++ b/clutter/clutter/clutter-frame-private.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_FRAME_PRIVATE_H -#define CLUTTER_FRAME_PRIVATE_H +#pragma once #include "clutter/clutter-frame.h" @@ -45,5 +44,3 @@ gpointer clutter_frame_new (size_t size, ((FrameType *) (clutter_frame_new (sizeof (FrameType), release))) ClutterFrameResult clutter_frame_get_result (ClutterFrame *frame); - -#endif /* CLUTTER_FRAME_PRIVATE_H */ diff --git a/clutter/clutter/clutter-frame.h b/clutter/clutter/clutter-frame.h index 6bac3f4e4..1d5660d68 100644 --- a/clutter/clutter/clutter-frame.h +++ b/clutter/clutter/clutter-frame.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_FRAME_H -#define CLUTTER_FRAME_H +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -56,5 +55,3 @@ CLUTTER_EXPORT gboolean clutter_frame_has_result (ClutterFrame *frame); G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterFrame, clutter_frame_unref) - -#endif /* CLUTTER_FRAME_H */ diff --git a/clutter/clutter/clutter-gesture-action-private.h b/clutter/clutter/clutter-gesture-action-private.h index cd804abc7..fb59f17d5 100644 --- a/clutter/clutter/clutter-gesture-action-private.h +++ b/clutter/clutter/clutter-gesture-action-private.h @@ -19,13 +19,10 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_GESTURE_ACTION_PRIVATE_H__ -#define __CLUTTER_GESTURE_ACTION_PRIVATE_H__ +#pragma once #include G_BEGIN_DECLS G_END_DECLS - -#endif /* __CLUTTER_GESTURE_ACTION_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-gesture-action.h b/clutter/clutter/clutter-gesture-action.h index 34b94e661..9dfdfbe8f 100644 --- a/clutter/clutter/clutter-gesture-action.h +++ b/clutter/clutter/clutter-gesture-action.h @@ -23,8 +23,7 @@ * Tomeu Vizoso */ -#ifndef __CLUTTER_GESTURE_ACTION_H__ -#define __CLUTTER_GESTURE_ACTION_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -143,5 +142,3 @@ void clutter_gesture_action_get_threshold_trigger_dis float *y); G_END_DECLS - -#endif /* __CLUTTER_GESTURE_ACTION_H__ */ diff --git a/clutter/clutter/clutter-grab.h b/clutter/clutter/clutter-grab.h index ca3324b68..73ac52096 100644 --- a/clutter/clutter/clutter-grab.h +++ b/clutter/clutter/clutter-grab.h @@ -21,8 +21,7 @@ * Author: Carlos Garnacho */ -#ifndef CLUTTER_GRAB_H -#define CLUTTER_GRAB_H +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -47,5 +46,3 @@ ClutterGrab * clutter_grab_ref (ClutterGrab *grab); CLUTTER_EXPORT void clutter_grab_unref (ClutterGrab *grab); - -#endif /* CLUTTER_GRAB_H */ diff --git a/clutter/clutter/clutter-graphene.h b/clutter/clutter/clutter-graphene.h index ddea3ca4a..b4ee29d3b 100644 --- a/clutter/clutter/clutter-graphene.h +++ b/clutter/clutter/clutter-graphene.h @@ -22,9 +22,6 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_GRAPHENE_H -#define CLUTTER_GRAPHENE_H +#pragma once void clutter_graphene_init (void); - -#endif diff --git a/clutter/clutter/clutter-grid-layout.h b/clutter/clutter/clutter-grid-layout.h index a9a9d7afb..67b017edc 100644 --- a/clutter/clutter/clutter-grid-layout.h +++ b/clutter/clutter/clutter-grid-layout.h @@ -26,8 +26,7 @@ * Matthias Clasen */ -#ifndef __CLUTTER_GRID_LAYOUT_H__ -#define __CLUTTER_GRID_LAYOUT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -145,5 +144,3 @@ CLUTTER_EXPORT gboolean clutter_grid_layout_get_row_homogeneous (ClutterGridLayout *layout); G_END_DECLS - -#endif /* __CLUTTER_GRID_LAYOUT_H__ */ diff --git a/clutter/clutter/clutter-image.h b/clutter/clutter/clutter-image.h index ad1d12f21..26d27962b 100644 --- a/clutter/clutter/clutter-image.h +++ b/clutter/clutter/clutter-image.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_IMAGE_H__ -#define __CLUTTER_IMAGE_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -81,5 +80,3 @@ CLUTTER_EXPORT CoglTexture * clutter_image_get_texture (ClutterImage *image); G_END_DECLS - -#endif /* __CLUTTER_IMAGE_H__ */ diff --git a/clutter/clutter/clutter-input-device-private.h b/clutter/clutter/clutter-input-device-private.h index 26dd2f11b..62175b041 100644 --- a/clutter/clutter/clutter-input-device-private.h +++ b/clutter/clutter/clutter-input-device-private.h @@ -21,8 +21,7 @@ * Author: Emmanuele Bassi */ -#ifndef CLUTTER_INPUT_DEVICE_PRIVATE_H -#define CLUTTER_INPUT_DEVICE_PRIVATE_H +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -57,5 +56,3 @@ struct _ClutterInputDevice ClutterVirtualInputDevice *accessibility_virtual_device; ClutterPtrA11yData *ptr_a11y_data; }; - -#endif /* CLUTTER_INPUT_DEVICE_PRIVATE_H */ diff --git a/clutter/clutter/clutter-input-device-tool.h b/clutter/clutter/clutter-input-device-tool.h index df5c8201d..d2eb3ec49 100644 --- a/clutter/clutter/clutter-input-device-tool.h +++ b/clutter/clutter/clutter-input-device-tool.h @@ -21,8 +21,7 @@ * Author: Carlos Garnacho */ -#ifndef __CLUTTER_INPUT_DEVICE_TOOL_H__ -#define __CLUTTER_INPUT_DEVICE_TOOL_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -68,5 +67,3 @@ CLUTTER_EXPORT ClutterInputAxisFlags clutter_input_device_tool_get_axes (ClutterInputDeviceTool *tool); G_END_DECLS - -#endif /* __CLUTTER_INPUT_DEVICE_TOOL_H__ */ diff --git a/clutter/clutter/clutter-input-device.h b/clutter/clutter/clutter-input-device.h index 5d7ecbfe1..ab3a64a25 100644 --- a/clutter/clutter/clutter-input-device.h +++ b/clutter/clutter/clutter-input-device.h @@ -21,8 +21,7 @@ * Author: Emmanuele Bassi */ -#ifndef __CLUTTER_INPUT_DEVICE_H__ -#define __CLUTTER_INPUT_DEVICE_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -127,5 +126,3 @@ gboolean clutter_input_device_get_dimensions (ClutterInputDevice *device, unsigned int *height); G_END_DECLS - -#endif /* __CLUTTER_INPUT_DEVICE_H__ */ diff --git a/clutter/clutter/clutter-input-focus-private.h b/clutter/clutter/clutter-input-focus-private.h index 5bc7e9494..60dc034fc 100644 --- a/clutter/clutter/clutter-input-focus-private.h +++ b/clutter/clutter/clutter-input-focus-private.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef __CLUTTER_INPUT_FOCUS_PRIVATE_H__ -#define __CLUTTER_INPUT_FOCUS_PRIVATE_H__ +#pragma once void clutter_input_focus_focus_in (ClutterInputFocus *focus, ClutterInputMethod *method); @@ -37,5 +36,3 @@ void clutter_input_focus_set_preedit_text (ClutterInputFocus *focus, const gchar *preedit, unsigned int cursor, unsigned int anchor); - -#endif /* __CLUTTER_INPUT_FOCUS_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-input-focus.h b/clutter/clutter/clutter-input-focus.h index b9c5557c5..a315d9c4c 100644 --- a/clutter/clutter/clutter-input-focus.h +++ b/clutter/clutter/clutter-input-focus.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef __CLUTTER_INPUT_FOCUS_H__ -#define __CLUTTER_INPUT_FOCUS_H__ +#pragma once #include @@ -86,5 +85,3 @@ void clutter_input_focus_set_can_show_preedit (ClutterInputFocus *focus, CLUTTER_EXPORT void clutter_input_focus_set_input_panel_state (ClutterInputFocus *focus, ClutterInputPanelState state); - -#endif /* __CLUTTER_INPUT_FOCUS_H__ */ diff --git a/clutter/clutter/clutter-input-method-private.h b/clutter/clutter/clutter-input-method-private.h index 61e575e7e..08a0da989 100644 --- a/clutter/clutter/clutter-input-method-private.h +++ b/clutter/clutter/clutter-input-method-private.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef __CLUTTER_INPUT_METHOD_PRIVATE_H__ -#define __CLUTTER_INPUT_METHOD_PRIVATE_H__ +#pragma once ClutterInputFocus * clutter_input_method_get_focus (ClutterInputMethod *method); @@ -42,5 +41,3 @@ gboolean clutter_input_method_filter_key_event (ClutterInputMethod *method, const ClutterKeyEvent *key); void clutter_input_method_toggle_input_panel (ClutterInputMethod *method); - -#endif /* __CLUTTER_INPUT_METHOD_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-input-method.h b/clutter/clutter/clutter-input-method.h index 34d48ec5e..c90a6f94c 100644 --- a/clutter/clutter/clutter-input-method.h +++ b/clutter/clutter/clutter-input-method.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef __CLUTTER_INPUT_METHOD_H__ -#define __CLUTTER_INPUT_METHOD_H__ +#pragma once #include @@ -95,5 +94,3 @@ void clutter_input_method_forward_key (ClutterInputMethod *im, uint32_t state, uint64_t time_, gboolean press); - -#endif /* __CLUTTER_INPUT_METHOD_H__ */ diff --git a/clutter/clutter/clutter-input-only-action.h b/clutter/clutter/clutter-input-only-action.h index 22cb2e205..f86e108dd 100644 --- a/clutter/clutter/clutter-input-only-action.h +++ b/clutter/clutter/clutter-input-only-action.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_INPUT_ONLY_ACTION_H -#define CLUTTER_INPUT_ONLY_ACTION_H +#pragma once #include "clutter/clutter.h" @@ -34,5 +33,3 @@ G_DECLARE_FINAL_TYPE (ClutterInputOnlyAction, clutter_input_only_action, ClutterInputOnlyAction * clutter_input_only_action_new (ClutterInputOnlyHandleEvent handle_event, gpointer user_data, GDestroyNotify destroy); - -#endif /* CLUTTER_INPUT_ONLY_ACTION_H */ diff --git a/clutter/clutter/clutter-input-only-actor.h b/clutter/clutter/clutter-input-only-actor.h index 6217915c0..1c45674a2 100644 --- a/clutter/clutter/clutter-input-only-actor.h +++ b/clutter/clutter/clutter-input-only-actor.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_INPUT_ONLY_ACTOR_H -#define CLUTTER_INPUT_ONLY_ACTOR_H +#pragma once #include "clutter/clutter.h" #include "clutter/clutter-stage-private.h" @@ -32,5 +31,3 @@ G_DECLARE_FINAL_TYPE (ClutterInputOnlyActor, clutter_input_only_actor, ClutterInputOnlyActor * clutter_input_only_actor_new (ClutterEventHandler event_handler, gpointer user_data, GDestroyNotify destroy); - -#endif /* CLUTTER_INPUT_ONLY_ACTOR_H */ diff --git a/clutter/clutter/clutter-input-pointer-a11y-private.h b/clutter/clutter/clutter-input-pointer-a11y-private.h index d7f465501..d8900cde4 100644 --- a/clutter/clutter/clutter-input-pointer-a11y-private.h +++ b/clutter/clutter/clutter-input-pointer-a11y-private.h @@ -19,8 +19,7 @@ * Author: Olivier Fourdan */ -#ifndef __CLUTTER_INPUT_POINTER_A11Y_H__ -#define __CLUTTER_INPUT_POINTER_A11Y_H__ +#pragma once #include #include "clutter-enum-types.h" @@ -47,5 +46,3 @@ void clutter_input_pointer_a11y_update (ClutterInputDevice *device, const ClutterEvent *event); G_END_DECLS - -#endif /* __CLUTTER_INPUT_POINTER_A11Y_H__ */ diff --git a/clutter/clutter/clutter-interval.h b/clutter/clutter/clutter-interval.h index 15c74dc1d..f7f08df48 100644 --- a/clutter/clutter/clutter-interval.h +++ b/clutter/clutter/clutter-interval.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_INTERVAL_H__ -#define __CLUTTER_INTERVAL_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -136,5 +135,3 @@ CLUTTER_EXPORT gboolean clutter_interval_is_valid (ClutterInterval *interval); G_END_DECLS - -#endif /* __CLUTTER_INTERVAL_H__ */ diff --git a/clutter/clutter/clutter-keyframe-transition.h b/clutter/clutter/clutter-keyframe-transition.h index 5f514cfa2..e3d33d78a 100644 --- a/clutter/clutter/clutter-keyframe-transition.h +++ b/clutter/clutter/clutter-keyframe-transition.h @@ -21,8 +21,7 @@ * Author: Emmanuele Bassi */ -#ifndef __CLUTTER_KEYFRAME_TRANSITION_H__ -#define __CLUTTER_KEYFRAME_TRANSITION_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -106,5 +105,3 @@ CLUTTER_EXPORT void clutter_keyframe_transition_clear (ClutterKeyframeTransition *transition); G_END_DECLS - -#endif /* __CLUTTER_KEYFRAME_TRANSITION_H__ */ diff --git a/clutter/clutter/clutter-keymap-private.h b/clutter/clutter/clutter-keymap-private.h index 2268e63f2..786b21f1b 100644 --- a/clutter/clutter/clutter-keymap-private.h +++ b/clutter/clutter/clutter-keymap-private.h @@ -18,8 +18,7 @@ * */ -#ifndef CLUTTER_KEYMAP_PRIVATE_H -#define CLUTTER_KEYMAP_PRIVATE_H +#pragma once #include "clutter/clutter-keymap.h" @@ -27,5 +26,3 @@ CLUTTER_EXPORT void clutter_keymap_set_lock_modifier_state (ClutterKeymap *keymap, gboolean caps_lock_state, gboolean num_lock_state); - -#endif /* CLUTTER_KEYMAP_PRIVATE_H */ diff --git a/clutter/clutter/clutter-keymap.h b/clutter/clutter/clutter-keymap.h index 3e317f6a1..03a165d14 100644 --- a/clutter/clutter/clutter-keymap.h +++ b/clutter/clutter/clutter-keymap.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef CLUTTER_KEYMAP_H -#define CLUTTER_KEYMAP_H +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -54,5 +53,3 @@ CLUTTER_EXPORT gboolean clutter_keymap_get_caps_lock_state (ClutterKeymap *keymap); PangoDirection clutter_keymap_get_direction (ClutterKeymap *keymap); - -#endif /* CLUTTER_KEYMAP_H */ diff --git a/clutter/clutter/clutter-keysyms-update.pl b/clutter/clutter/clutter-keysyms-update.pl index a37598140..13e8df2a2 100755 --- a/clutter/clutter/clutter-keysyms-update.pl +++ b/clutter/clutter/clutter-keysyms-update.pl @@ -94,8 +94,7 @@ print OUT_KEYSYMS<) close IN_XF86KEYSYM; - -print OUT_KEYSYMS< can be included directly." @@ -40,5 +40,3 @@ CLUTTER_EXPORT char * clutter_keyval_name (unsigned int keyval); G_END_DECLS - -#endif /* __CLUTTER_KEYVAL_H__ */ diff --git a/clutter/clutter/clutter-layout-manager.h b/clutter/clutter/clutter-layout-manager.h index 29329f25a..ef6bbd494 100644 --- a/clutter/clutter/clutter-layout-manager.h +++ b/clutter/clutter/clutter-layout-manager.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_LAYOUT_MANAGER_H__ -#define __CLUTTER_LAYOUT_MANAGER_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -180,5 +179,3 @@ void clutter_layout_manager_child_get_property (ClutterLayoutMa GValue *value); G_END_DECLS - -#endif /* __CLUTTER_LAYOUT_MANAGER_H__ */ diff --git a/clutter/clutter/clutter-layout-meta.h b/clutter/clutter/clutter-layout-meta.h index d8a5d5f23..6a26076b1 100644 --- a/clutter/clutter/clutter-layout-meta.h +++ b/clutter/clutter/clutter-layout-meta.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_LAYOUT_META_H__ -#define __CLUTTER_LAYOUT_META_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -74,5 +73,3 @@ CLUTTER_EXPORT ClutterLayoutManager *clutter_layout_meta_get_manager (ClutterLayoutMeta *data); G_END_DECLS - -#endif /* __CLUTTER_LAYOUT_META_H__ */ diff --git a/clutter/clutter/clutter-macros.h b/clutter/clutter/clutter-macros.h index a544afd5c..d42dd42d3 100644 --- a/clutter/clutter/clutter-macros.h +++ b/clutter/clutter/clutter-macros.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_MACROS_H__ -#define __CLUTTER_MACROS_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -77,5 +76,3 @@ * for testability purposes */ #define CLUTTER_EXPORT_TEST CLUTTER_EXPORT - -#endif /* __CLUTTER_MACROS_H__ */ diff --git a/clutter/clutter/clutter-main.h b/clutter/clutter/clutter-main.h index 5b1ed7e8c..9657b1717 100644 --- a/clutter/clutter/clutter-main.h +++ b/clutter/clutter/clutter-main.h @@ -21,8 +21,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_MAIN_H__ -#define __CLUTTER_MAIN_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -154,5 +153,3 @@ CLUTTER_EXPORT ClutterTextDirection clutter_get_text_direction (void); G_END_DECLS - -#endif /* _CLUTTER_MAIN_H__ */ diff --git a/clutter/clutter/clutter-mutter.h b/clutter/clutter/clutter-mutter.h index 9fec1c008..23425eb73 100644 --- a/clutter/clutter/clutter-mutter.h +++ b/clutter/clutter/clutter-mutter.h @@ -20,8 +20,7 @@ * */ -#ifndef __CLUTTER_MUTTER_H__ -#define __CLUTTER_MUTTER_H__ +#pragma once #define __CLUTTER_H_INSIDE__ @@ -141,5 +140,3 @@ void clutter_actor_get_relative_transformation_matrix (ClutterActor *self, graphene_matrix_t *matrix); #undef __CLUTTER_H_INSIDE__ - -#endif /* __CLUTTER_MUTTER_H__ */ diff --git a/clutter/clutter/clutter-offscreen-effect-private.h b/clutter/clutter/clutter-offscreen-effect-private.h index a5249dad3..4aad5af8a 100644 --- a/clutter/clutter/clutter-offscreen-effect-private.h +++ b/clutter/clutter/clutter-offscreen-effect-private.h @@ -1,10 +1,7 @@ -#ifndef __CLUTTER_OFFSCREEN_EFFECT_PRIVATE_H__ -#define __CLUTTER_OFFSCREEN_EFFECT_PRIVATE_H__ +#pragma once #include G_BEGIN_DECLS G_END_DECLS - -#endif /* __CLUTTER_OFFSCREEN_EFFECT_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-offscreen-effect.h b/clutter/clutter/clutter-offscreen-effect.h index dedb9443c..0ed0ff42d 100644 --- a/clutter/clutter/clutter-offscreen-effect.h +++ b/clutter/clutter/clutter-offscreen-effect.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_OFFSCREEN_EFFECT_H__ -#define __CLUTTER_OFFSCREEN_EFFECT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -100,5 +99,3 @@ gboolean clutter_offscreen_effect_get_target_size (ClutterOffscree gfloat *height); G_END_DECLS - -#endif /* __CLUTTER_OFFSCREEN_EFFECT_H__ */ diff --git a/clutter/clutter/clutter-page-turn-effect.h b/clutter/clutter/clutter-page-turn-effect.h index 46f45b600..595b3654d 100644 --- a/clutter/clutter/clutter-page-turn-effect.h +++ b/clutter/clutter/clutter-page-turn-effect.h @@ -25,8 +25,7 @@ * Chris Lord */ -#ifndef __CLUTTER_PAGE_TURN_EFFECT_H__ -#define __CLUTTER_PAGE_TURN_EFFECT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -68,5 +67,3 @@ CLUTTER_EXPORT gfloat clutter_page_turn_effect_get_radius (ClutterPageTurnEffect *effect); G_END_DECLS - -#endif /* __CLUTTER_PAGE_TURN_EFFECT_H__ */ diff --git a/clutter/clutter/clutter-paint-context-private.h b/clutter/clutter/clutter-paint-context-private.h index e15245ee6..97a195f5e 100644 --- a/clutter/clutter/clutter-paint-context-private.h +++ b/clutter/clutter/clutter-paint-context-private.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_PAINT_CONTEXT_PRIVATE_H -#define CLUTTER_PAINT_CONTEXT_PRIVATE_H +#pragma once #include "clutter-paint-context.h" @@ -35,5 +34,3 @@ clutter_paint_context_get_clip_frusta (ClutterPaintContext *paint_context); void clutter_paint_context_assign_frame (ClutterPaintContext *paint_context, ClutterFrame *frame); - -#endif /* CLUTTER_PAINT_CONTEXT_PRIVATE_H */ diff --git a/clutter/clutter/clutter-paint-context.h b/clutter/clutter/clutter-paint-context.h index 9370ae163..c3c684c71 100644 --- a/clutter/clutter/clutter-paint-context.h +++ b/clutter/clutter/clutter-paint-context.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_PAINT_CONTEXT_H -#define CLUTTER_PAINT_CONTEXT_H +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -77,5 +76,3 @@ ClutterPaintFlag clutter_paint_context_get_paint_flags (ClutterPaintContext *pai CLUTTER_EXPORT ClutterFrame * clutter_paint_context_get_frame (ClutterPaintContext *paint_context); - -#endif /* CLUTTER_PAINT_CONTEXT_H */ diff --git a/clutter/clutter/clutter-paint-node-private.h b/clutter/clutter/clutter-paint-node-private.h index c10f10f7e..c6803845c 100644 --- a/clutter/clutter/clutter-paint-node-private.h +++ b/clutter/clutter/clutter-paint-node-private.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_PAINT_NODE_PRIVATE_H__ -#define __CLUTTER_PAINT_NODE_PRIVATE_H__ +#pragma once #include #include @@ -164,5 +163,3 @@ CLUTTER_EXPORT ClutterPaintNode * clutter_effect_node_new (ClutterEffect *effect); G_END_DECLS - -#endif /* __CLUTTER_PAINT_NODE_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-paint-node.h b/clutter/clutter/clutter-paint-node.h index 0b1548e43..5c86be0cc 100644 --- a/clutter/clutter/clutter-paint-node.h +++ b/clutter/clutter/clutter-paint-node.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_PAINT_NODE_H__ -#define __CLUTTER_PAINT_NODE_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -117,5 +116,3 @@ CLUTTER_EXPORT gpointer clutter_value_dup_paint_node (const GValue *value); G_END_DECLS - -#endif /* __CLUTTER_PAINT_NODE_H__ */ diff --git a/clutter/clutter/clutter-paint-nodes.h b/clutter/clutter/clutter-paint-nodes.h index d98809ffe..10af06911 100644 --- a/clutter/clutter/clutter-paint-nodes.h +++ b/clutter/clutter/clutter-paint-nodes.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_PAINT_NODES_H__ -#define __CLUTTER_PAINT_NODES_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -205,5 +204,3 @@ ClutterPaintNode * clutter_blur_node_new (unsigned int width, float sigma); G_END_DECLS - -#endif /* __CLUTTER_PAINT_NODES_H__ */ diff --git a/clutter/clutter/clutter-paint-volume-private.h b/clutter/clutter/clutter-paint-volume-private.h index accaa4835..56e097b1f 100644 --- a/clutter/clutter/clutter-paint-volume-private.h +++ b/clutter/clutter/clutter-paint-volume-private.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_PAINT_VOLUME_PRIVATE_H__ -#define __CLUTTER_PAINT_VOLUME_PRIVATE_H__ +#pragma once #include #include @@ -137,5 +136,3 @@ void clutter_paint_volume_to_box (ClutterPaintVolu graphene_box_t *box); G_END_DECLS - -#endif /* __CLUTTER_PAINT_VOLUME_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-pan-action.h b/clutter/clutter/clutter-pan-action.h index 106bd6712..8b47a291f 100644 --- a/clutter/clutter/clutter-pan-action.h +++ b/clutter/clutter/clutter-pan-action.h @@ -30,8 +30,7 @@ * Chris Lord */ -#ifndef __CLUTTER_PAN_ACTION_H__ -#define __CLUTTER_PAN_ACTION_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -127,5 +126,3 @@ gfloat clutter_pan_action_get_constrained_motion_delta (ClutterPanActio gfloat *delta_x, gfloat *delta_y); G_END_DECLS - -#endif /* __CLUTTER_PAN_ACTION_H__ */ diff --git a/clutter/clutter/clutter-path-constraint.h b/clutter/clutter/clutter-path-constraint.h index 9a7bddb54..202ed3f57 100644 --- a/clutter/clutter/clutter-path-constraint.h +++ b/clutter/clutter/clutter-path-constraint.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_PATH_CONSTRAINT_H__ -#define __CLUTTER_PATH_CONSTRAINT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -60,5 +59,3 @@ CLUTTER_EXPORT gfloat clutter_path_constraint_get_offset (ClutterPathConstraint *constraint); G_END_DECLS - -#endif /* __CLUTTER_PATH_CONSTRAINT_H__ */ diff --git a/clutter/clutter/clutter-path.h b/clutter/clutter/clutter-path.h index 7fde33c9d..245b10879 100644 --- a/clutter/clutter/clutter-path.h +++ b/clutter/clutter/clutter-path.h @@ -21,8 +21,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_PATH_H__ -#define __CLUTTER_PATH_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -159,5 +158,3 @@ CLUTTER_EXPORT guint clutter_path_get_length (ClutterPath *path); G_END_DECLS - -#endif /* __CLUTTER_PATH_H__ */ diff --git a/clutter/clutter/clutter-pick-context-private.h b/clutter/clutter/clutter-pick-context-private.h index f40de6f3d..b41493a77 100644 --- a/clutter/clutter/clutter-pick-context-private.h +++ b/clutter/clutter/clutter-pick-context-private.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_PICK_CONTEXT_PRIVATE_H -#define CLUTTER_PICK_CONTEXT_PRIVATE_H +#pragma once #include "clutter-pick-context.h" #include "clutter-pick-stack-private.h" @@ -33,5 +32,3 @@ clutter_pick_context_steal_stack (ClutterPickContext *pick_context); gboolean clutter_pick_context_intersects_box (ClutterPickContext *pick_context, const graphene_box_t *box); - -#endif /* CLUTTER_PICK_CONTEXT_PRIVATE_H */ diff --git a/clutter/clutter/clutter-pick-context.h b/clutter/clutter/clutter-pick-context.h index 730db1a0a..2e4efc534 100644 --- a/clutter/clutter/clutter-pick-context.h +++ b/clutter/clutter/clutter-pick-context.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_PICK_CONTEXT_H -#define CLUTTER_PICK_CONTEXT_H +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -71,5 +70,3 @@ void clutter_pick_context_get_transform (ClutterPickContext *pick_context, CLUTTER_EXPORT void clutter_pick_context_pop_transform (ClutterPickContext *pick_context); - -#endif /* CLUTTER_PICK_CONTEXT_H */ diff --git a/clutter/clutter/clutter-pick-stack-private.h b/clutter/clutter/clutter-pick-stack-private.h index 9bcf5dd82..d6a5452ee 100644 --- a/clutter/clutter/clutter-pick-stack-private.h +++ b/clutter/clutter/clutter-pick-stack-private.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_PICK_STACK_PRIVATE_H -#define CLUTTER_PICK_STACK_PRIVATE_H +#pragma once #include @@ -67,5 +66,3 @@ clutter_pick_stack_search_actor (ClutterPickStack *pick_stack, G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPickStack, clutter_pick_stack_unref) G_END_DECLS - -#endif /* CLUTTER_PICK_STACK_PRIVATE_H */ diff --git a/clutter/clutter/clutter-private.h b/clutter/clutter/clutter-private.h index 9492ba4af..c658f6de5 100644 --- a/clutter/clutter/clutter-private.h +++ b/clutter/clutter/clutter-private.h @@ -23,8 +23,7 @@ * */ -#ifndef __CLUTTER_PRIVATE_H__ -#define __CLUTTER_PRIVATE_H__ +#pragma once #include #include @@ -320,5 +319,3 @@ s2ms (int64_t s) } G_END_DECLS - -#endif /* __CLUTTER_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-property-transition.h b/clutter/clutter/clutter-property-transition.h index 6628328ce..fa79162be 100644 --- a/clutter/clutter/clutter-property-transition.h +++ b/clutter/clutter/clutter-property-transition.h @@ -21,8 +21,7 @@ * Author: Emmanuele Bassi */ -#ifndef __CLUTTER_PROPERTY_TRANSITION_H__ -#define __CLUTTER_PROPERTY_TRANSITION_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -80,5 +79,3 @@ CLUTTER_EXPORT const char * clutter_property_transition_get_property_name (ClutterPropertyTransition *transition); G_END_DECLS - -#endif /* __CLUTTER_PROPERTY_TRANSITION_H__ */ diff --git a/clutter/clutter/clutter-rotate-action.h b/clutter/clutter/clutter-rotate-action.h index cd78b2382..f366932aa 100644 --- a/clutter/clutter/clutter-rotate-action.h +++ b/clutter/clutter/clutter-rotate-action.h @@ -22,8 +22,7 @@ * Lionel Landwerlin */ -#ifndef __CLUTTER_ROTATE_ACTION_H__ -#define __CLUTTER_ROTATE_ACTION_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -72,5 +71,3 @@ CLUTTER_EXPORT ClutterAction *clutter_rotate_action_new (void); G_END_DECLS - -#endif /* __CLUTTER_ROTATE_ACTION_H__ */ diff --git a/clutter/clutter/clutter-script-private.h b/clutter/clutter/clutter-script-private.h index 52c240e2a..6ccb785e0 100644 --- a/clutter/clutter/clutter-script-private.h +++ b/clutter/clutter/clutter-script-private.h @@ -23,8 +23,7 @@ * */ -#ifndef __CLUTTER_SCRIPT_PRIVATE_H__ -#define __CLUTTER_SCRIPT_PRIVATE_H__ +#pragma once #include #include @@ -164,5 +163,3 @@ void _clutter_script_add_object_info (ClutterScript *script, const gchar *_clutter_script_get_id_from_node (JsonNode *node); G_END_DECLS - -#endif /* __CLUTTER_SCRIPT_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-script.h b/clutter/clutter/clutter-script.h index 881721aeb..dae6f21b4 100644 --- a/clutter/clutter/clutter-script.h +++ b/clutter/clutter/clutter-script.h @@ -21,8 +21,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_SCRIPT_H__ -#define __CLUTTER_SCRIPT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -181,5 +180,3 @@ CLUTTER_EXPORT const gchar * clutter_get_script_id (GObject *gobject); G_END_DECLS - -#endif /* __CLUTTER_SCRIPT_H__ */ diff --git a/clutter/clutter/clutter-scriptable.h b/clutter/clutter/clutter-scriptable.h index f7ccd5923..de7e885ee 100644 --- a/clutter/clutter/clutter-scriptable.h +++ b/clutter/clutter/clutter-scriptable.h @@ -22,8 +22,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_SCRIPTABLE_H__ -#define __CLUTTER_SCRIPTABLE_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -97,5 +96,3 @@ void clutter_scriptable_set_custom_property (ClutterScriptable const GValue *value); G_END_DECLS - -#endif /* __CLUTTER_SCRIPTABLE_H__ */ diff --git a/clutter/clutter/clutter-scroll-actor.h b/clutter/clutter/clutter-scroll-actor.h index 1a6cfa3e4..6a913b8bd 100644 --- a/clutter/clutter/clutter-scroll-actor.h +++ b/clutter/clutter/clutter-scroll-actor.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_SCROLL_ACTOR_H__ -#define __CLUTTER_SCROLL_ACTOR_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -81,5 +80,3 @@ void clutter_scroll_actor_scroll_to_rect (ClutterScrollAc const graphene_rect_t *rect); G_END_DECLS - -#endif /* __CLUTTER_SCROLL_ACTOR_H__ */ diff --git a/clutter/clutter/clutter-seat-private.h b/clutter/clutter/clutter-seat-private.h index 8271799a2..67f074cf5 100644 --- a/clutter/clutter/clutter-seat-private.h +++ b/clutter/clutter/clutter-seat-private.h @@ -20,8 +20,7 @@ * */ -#ifndef CLUTTER_SEAT_PRIVATE_H -#define CLUTTER_SEAT_PRIVATE_H +#pragma once #include "clutter/clutter-types.h" @@ -37,5 +36,3 @@ CLUTTER_EXPORT void clutter_seat_init_pointer_position (ClutterSeat *seat, float x, float y); - -#endif /* CLUTTER_SEAT_PRIVATE_H */ diff --git a/clutter/clutter/clutter-seat.h b/clutter/clutter/clutter-seat.h index e4184f7ce..bef35ac4d 100644 --- a/clutter/clutter/clutter-seat.h +++ b/clutter/clutter/clutter-seat.h @@ -20,8 +20,8 @@ * * Author: Carlos Garnacho */ -#ifndef CLUTTER_SEAT_H -#define CLUTTER_SEAT_H + +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -174,5 +174,3 @@ gboolean clutter_seat_query_state (ClutterSeat *seat, CLUTTER_EXPORT const char * clutter_seat_get_name (ClutterSeat *seat); - -#endif /* CLUTTER_SEAT_H */ diff --git a/clutter/clutter/clutter-settings-private.h b/clutter/clutter/clutter-settings-private.h index a8a8e01e3..e99753068 100644 --- a/clutter/clutter/clutter-settings-private.h +++ b/clutter/clutter/clutter-settings-private.h @@ -1,5 +1,4 @@ -#ifndef __CLUTTER_SETTINGS_PRIVATE_H__ -#define __CLUTTER_SETTINGS_PRIVATE_H__ +#pragma once #include #include @@ -17,5 +16,3 @@ void clutter_settings_ensure_pointer_a11y_settings (ClutterSettings *settings, ClutterSeat *seat); G_END_DECLS - -#endif /* __CLUTTER_SETTINGS_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-settings.h b/clutter/clutter/clutter-settings.h index bb3911e9d..5606f7bec 100644 --- a/clutter/clutter/clutter-settings.h +++ b/clutter/clutter/clutter-settings.h @@ -1,5 +1,4 @@ -#ifndef __CLUTTER_SETTINGS_H__ -#define __CLUTTER_SETTINGS_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -23,5 +22,3 @@ CLUTTER_EXPORT ClutterSettings *clutter_settings_get_default (void); G_END_DECLS - -#endif /* __CLUTTER_SETTINGS_H__ */ diff --git a/clutter/clutter/clutter-shader-effect.h b/clutter/clutter/clutter-shader-effect.h index 00079920f..9a8799b6a 100644 --- a/clutter/clutter/clutter-shader-effect.h +++ b/clutter/clutter/clutter-shader-effect.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_SHADER_EFFECT_H__ -#define __CLUTTER_SHADER_EFFECT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -99,5 +98,3 @@ CLUTTER_EXPORT CoglHandle clutter_shader_effect_get_program (ClutterShaderEffect *effect); G_END_DECLS - -#endif /* __CLUTTER_SHADER_EFFECT_H__ */ diff --git a/clutter/clutter/clutter-shader-types.h b/clutter/clutter/clutter-shader-types.h index 94a67c56a..de03a50fb 100644 --- a/clutter/clutter/clutter-shader-types.h +++ b/clutter/clutter/clutter-shader-types.h @@ -21,8 +21,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_SHADER_TYPES_H__ -#define __CLUTTER_SHADER_TYPES_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -94,5 +93,3 @@ const gfloat * clutter_value_get_shader_matrix (const GValue *value, gsize *length); G_END_DECLS - -#endif /* __CLUTTER_SHADER_TYPES_H__ */ diff --git a/clutter/clutter/clutter-snap-constraint.h b/clutter/clutter/clutter-snap-constraint.h index 8ee5343ce..355d20603 100644 --- a/clutter/clutter/clutter-snap-constraint.h +++ b/clutter/clutter/clutter-snap-constraint.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_SNAP_CONSTRAINT_H__ -#define __CLUTTER_SNAP_CONSTRAINT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -69,5 +68,3 @@ CLUTTER_EXPORT gfloat clutter_snap_constraint_get_offset (ClutterSnapConstraint *constraint); G_END_DECLS - -#endif /* __CLUTTER_SNAP_CONSTRAINT_H__ */ diff --git a/clutter/clutter/clutter-stage-manager-private.h b/clutter/clutter/clutter-stage-manager-private.h index 81ebbb6c0..2441f579e 100644 --- a/clutter/clutter/clutter-stage-manager-private.h +++ b/clutter/clutter/clutter-stage-manager-private.h @@ -22,8 +22,7 @@ * Emmanuele Bassi */ -#ifndef __CLUTTER_STAGE_MANAGER_PRIVATE_H__ -#define __CLUTTER_STAGE_MANAGER_PRIVATE_H__ +#pragma once #include @@ -45,5 +44,3 @@ void _clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manage ClutterStage *stage); G_END_DECLS - -#endif /* __CLUTTER_STAGE_MANAGER_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-stage-manager.h b/clutter/clutter/clutter-stage-manager.h index 0900c5150..4614183bf 100644 --- a/clutter/clutter/clutter-stage-manager.h +++ b/clutter/clutter/clutter-stage-manager.h @@ -21,8 +21,7 @@ * Author: Emmanuele Bassi */ -#ifndef __CLUTTER_STAGE_MANAGER_H__ -#define __CLUTTER_STAGE_MANAGER_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -72,5 +71,3 @@ CLUTTER_EXPORT const GSList * clutter_stage_manager_peek_stages (ClutterStageManager *stage_manager); G_END_DECLS - -#endif /* __CLUTTER_STAGE_MANAGER_H__ */ diff --git a/clutter/clutter/clutter-stage-private.h b/clutter/clutter/clutter-stage-private.h index fb973088c..584fdd3a7 100644 --- a/clutter/clutter/clutter-stage-private.h +++ b/clutter/clutter/clutter-stage-private.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_STAGE_PRIVATE_H__ -#define __CLUTTER_STAGE_PRIVATE_H__ +#pragma once #include #include @@ -172,5 +171,3 @@ ClutterGrab * clutter_stage_grab_input_only (ClutterStage *self, GDestroyNotify user_data_destroy); G_END_DECLS - -#endif /* __CLUTTER_STAGE_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-stage-view-private.h b/clutter/clutter/clutter-stage-view-private.h index 309dde496..207cc1a9f 100644 --- a/clutter/clutter/clutter-stage-view-private.h +++ b/clutter/clutter/clutter-stage-view-private.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_STAGE_VIEW_PRIVATE_H__ -#define __CLUTTER_STAGE_VIEW_PRIVATE_H__ +#pragma once #include "clutter/clutter-stage-view.h" #include "clutter/clutter-types.h" @@ -86,5 +85,3 @@ CLUTTER_EXPORT void clutter_stage_view_notify_ready (ClutterStageView *view); void clutter_stage_view_invalidate_input_devices (ClutterStageView *view); - -#endif /* __CLUTTER_STAGE_VIEW_PRIVATE_H__ */ diff --git a/clutter/clutter/clutter-stage-view.h b/clutter/clutter/clutter-stage-view.h index c17c587a2..8c3c712ac 100644 --- a/clutter/clutter/clutter-stage-view.h +++ b/clutter/clutter/clutter-stage-view.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_STAGE_VIEW_H__ -#define __CLUTTER_STAGE_VIEW_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -95,5 +94,3 @@ void clutter_stage_view_schedule_update_now (ClutterStageView *view); CLUTTER_EXPORT ClutterPaintFlag clutter_stage_view_get_default_paint_flags (ClutterStageView *view); - -#endif /* __CLUTTER_STAGE_VIEW_H__ */ diff --git a/clutter/clutter/clutter-stage-window.h b/clutter/clutter/clutter-stage-window.h index 5af5cffa9..6e2ce259a 100644 --- a/clutter/clutter/clutter-stage-window.h +++ b/clutter/clutter/clutter-stage-window.h @@ -1,5 +1,4 @@ -#ifndef __CLUTTER_STAGE_WINDOW_H__ -#define __CLUTTER_STAGE_WINDOW_H__ +#pragma once #include #include @@ -102,5 +101,3 @@ void _clutter_stage_window_finish_frame (ClutterStageWin int64_t _clutter_stage_window_get_frame_counter (ClutterStageWindow *window); G_END_DECLS - -#endif /* __CLUTTER_STAGE_WINDOW_H__ */ diff --git a/clutter/clutter/clutter-stage.h b/clutter/clutter/clutter-stage.h index 4a82abfb3..9ba7efd86 100644 --- a/clutter/clutter/clutter-stage.h +++ b/clutter/clutter/clutter-stage.h @@ -21,8 +21,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_STAGE_H__ -#define __CLUTTER_STAGE_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -244,5 +243,3 @@ CLUTTER_EXPORT ClutterActor * clutter_stage_get_grab_actor (ClutterStage *stage); G_END_DECLS - -#endif /* __CLUTTER_STAGE_H__ */ diff --git a/clutter/clutter/clutter-swipe-action.h b/clutter/clutter/clutter-swipe-action.h index ddc6699a2..89c284e71 100644 --- a/clutter/clutter/clutter-swipe-action.h +++ b/clutter/clutter/clutter-swipe-action.h @@ -26,13 +26,12 @@ * Emmanuele Bassi */ +#pragma once + #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CLUTTER_SWIPE_ACTION_H__ -#define __CLUTTER_SWIPE_ACTION_H__ - #include G_BEGIN_DECLS @@ -83,5 +82,3 @@ CLUTTER_EXPORT ClutterAction * clutter_swipe_action_new (void); G_END_DECLS - -#endif /* __CLUTTER_SWIPE_ACTION_H__ */ diff --git a/clutter/clutter/clutter-tap-action.h b/clutter/clutter/clutter-tap-action.h index f478588ea..d1e4afd55 100644 --- a/clutter/clutter/clutter-tap-action.h +++ b/clutter/clutter/clutter-tap-action.h @@ -31,8 +31,7 @@ * Chris Lord */ -#ifndef __CLUTTER_TAP_ACTION_H__ -#define __CLUTTER_TAP_ACTION_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -82,5 +81,3 @@ GType clutter_tap_action_get_type (void) G_GNUC_CONST; CLUTTER_EXPORT ClutterAction * clutter_tap_action_new (void); G_END_DECLS - -#endif /* __CLUTTER_TAP_ACTION_H__ */ diff --git a/clutter/clutter/clutter-text-buffer.h b/clutter/clutter/clutter-text-buffer.h index 6f082168d..190833224 100644 --- a/clutter/clutter/clutter-text-buffer.h +++ b/clutter/clutter/clutter-text-buffer.h @@ -19,8 +19,7 @@ * Author: Stef Walter */ -#ifndef __CLUTTER_TEXT_BUFFER_H__ -#define __CLUTTER_TEXT_BUFFER_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -145,5 +144,3 @@ void clutter_text_buffer_emit_deleted_text (ClutterTextBuffer * guint n_chars); G_END_DECLS - -#endif /* __CLUTTER_TEXT_BUFFER_H__ */ diff --git a/clutter/clutter/clutter-text.h b/clutter/clutter/clutter-text.h index ba4c4b865..c379e3ea4 100644 --- a/clutter/clutter/clutter-text.h +++ b/clutter/clutter/clutter-text.h @@ -22,8 +22,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_TEXT_H__ -#define __CLUTTER_TEXT_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -298,5 +297,3 @@ CLUTTER_EXPORT gboolean clutter_text_has_preedit (ClutterText *self); G_END_DECLS - -#endif /* __CLUTTER_TEXT_H__ */ diff --git a/clutter/clutter/clutter-texture-content.h b/clutter/clutter/clutter-texture-content.h index 4f2c21c9f..49108a6ce 100644 --- a/clutter/clutter/clutter-texture-content.h +++ b/clutter/clutter/clutter-texture-content.h @@ -24,8 +24,7 @@ * Robert Mader */ -#ifndef CLUTTER_TEXTURE_CONTENT_H -#define CLUTTER_TEXTURE_CONTENT_H +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -49,5 +48,3 @@ CLUTTER_EXPORT CoglTexture * clutter_texture_content_get_texture (ClutterTextureContent *texture_content); G_END_DECLS - -#endif /* CLUTTER_TEXTURE_CONTENT_H */ diff --git a/clutter/clutter/clutter-timeline-private.h b/clutter/clutter/clutter-timeline-private.h index 38e712bfd..799780025 100644 --- a/clutter/clutter/clutter-timeline-private.h +++ b/clutter/clutter/clutter-timeline-private.h @@ -21,13 +21,10 @@ * License along with this library. If not, see . */ -#ifndef CLUTTER_TIMELINE_PRIVATE_H -#define CLUTTER_TIMELINE_PRIVATE_H +#pragma once void _clutter_timeline_advance (ClutterTimeline *timeline, int64_t tick_time); int64_t _clutter_timeline_get_delta (ClutterTimeline *timeline); void _clutter_timeline_do_tick (ClutterTimeline *timeline, int64_t tick_time); - -#endif /* CLUTTER_TIMELINE_PRIVATE_H */ diff --git a/clutter/clutter/clutter-timeline.h b/clutter/clutter/clutter-timeline.h index 684b61ad2..1a68b797e 100644 --- a/clutter/clutter/clutter-timeline.h +++ b/clutter/clutter/clutter-timeline.h @@ -21,13 +21,12 @@ * License along with this library. If not, see . */ +#pragma once + #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CLUTTER_TIMELINE_H__ -#define __CLUTTER_TIMELINE_H__ - #include G_BEGIN_DECLS @@ -223,5 +222,3 @@ void clutter_timeline_set_frame_clock ClutterFrameClock *frame_clock); G_END_DECLS - -#endif /* _CLUTTER_TIMELINE_H__ */ diff --git a/clutter/clutter/clutter-transition-group.h b/clutter/clutter/clutter-transition-group.h index d263600a9..302003e36 100644 --- a/clutter/clutter/clutter-transition-group.h +++ b/clutter/clutter/clutter-transition-group.h @@ -21,8 +21,7 @@ * Author: Emmanuele Bassi */ -#ifndef __CLUTTER_TRANSITION_GROUP_H__ -#define __CLUTTER_TRANSITION_GROUP_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -79,5 +78,3 @@ CLUTTER_EXPORT void clutter_transition_group_remove_all (ClutterTransitionGroup *group); G_END_DECLS - -#endif /* __CLUTTER_TRANSITION_GROUP_H__ */ diff --git a/clutter/clutter/clutter-transition.h b/clutter/clutter/clutter-transition.h index a0d7aba87..dac3ba9bf 100644 --- a/clutter/clutter/clutter-transition.h +++ b/clutter/clutter/clutter-transition.h @@ -21,8 +21,7 @@ * Author: Emmanuele Bassi */ -#ifndef __CLUTTER_TRANSITION_H__ -#define __CLUTTER_TRANSITION_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -115,5 +114,3 @@ CLUTTER_EXPORT gboolean clutter_transition_get_remove_on_complete (ClutterTransition *transition); G_END_DECLS - -#endif /* __CLUTTER_TRANSITION_H__ */ diff --git a/clutter/clutter/clutter-types.h b/clutter/clutter/clutter-types.h index 8c06f12f6..1459fbbc7 100644 --- a/clutter/clutter/clutter-types.h +++ b/clutter/clutter/clutter-types.h @@ -21,8 +21,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_TYPES_H__ -#define __CLUTTER_TYPES_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -418,5 +417,3 @@ void clutter_interval_register_progress_func (GType value_type, ClutterProgressFunc func); G_END_DECLS - -#endif /* __CLUTTER_TYPES_H__ */ diff --git a/clutter/clutter/clutter-units.h b/clutter/clutter/clutter-units.h index 9d232021e..09586f81b 100644 --- a/clutter/clutter/clutter-units.h +++ b/clutter/clutter/clutter-units.h @@ -24,8 +24,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_UNITS_H__ -#define __CLUTTER_UNITS_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -164,5 +163,3 @@ CLUTTER_EXPORT const ClutterUnits * clutter_value_get_units (const GValue *value); G_END_DECLS - -#endif /* __CLUTTER_UNITS_H__ */ diff --git a/clutter/clutter/clutter-virtual-input-device.h b/clutter/clutter/clutter-virtual-input-device.h index eeceb7a56..93f5cd01d 100644 --- a/clutter/clutter/clutter-virtual-input-device.h +++ b/clutter/clutter/clutter-virtual-input-device.h @@ -21,8 +21,7 @@ * Author: Jonas Ådahl */ -#ifndef __CLUTTER_VIRTUAL_INPUT_DEVICE_H__ -#define __CLUTTER_VIRTUAL_INPUT_DEVICE_H__ +#pragma once #include #include @@ -176,5 +175,3 @@ int clutter_virtual_input_device_get_device_type (ClutterVirtualInputDevice *vir CLUTTER_EXPORT ClutterSeat * clutter_virtual_input_device_get_seat (ClutterVirtualInputDevice *virtual_device); - -#endif /* __CLUTTER_VIRTUAL_INPUT_DEVICE_H__ */ diff --git a/clutter/clutter/clutter-zoom-action.h b/clutter/clutter/clutter-zoom-action.h index 04cf5bfb8..7fbc16f57 100644 --- a/clutter/clutter/clutter-zoom-action.h +++ b/clutter/clutter/clutter-zoom-action.h @@ -22,8 +22,7 @@ * Lionel Landwerlin */ -#ifndef __CLUTTER_ZOOM_ACTION_H__ -#define __CLUTTER_ZOOM_ACTION_H__ +#pragma once #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." @@ -81,5 +80,3 @@ void clutter_zoom_action_get_transformed_focal_point (ClutterZoomActi graphene_point_t *point); G_END_DECLS - -#endif /* __CLUTTER_ZOOM_ACTION_H__ */ diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h index 6295ae7b4..035f82be6 100644 --- a/clutter/clutter/clutter.h +++ b/clutter/clutter/clutter.h @@ -23,8 +23,7 @@ * */ -#ifndef __CLUTTER_H__ -#define __CLUTTER_H__ +#pragma once #define __CLUTTER_H_INSIDE__ @@ -116,5 +115,3 @@ #include "clutter-autocleanups.h" #undef __CLUTTER_H_INSIDE__ - -#endif /* __CLUTTER_H__ */ diff --git a/clutter/clutter/deprecated/clutter-container.h b/clutter/clutter/deprecated/clutter-container.h index 10cd9d0c0..c24195a7b 100644 --- a/clutter/clutter/deprecated/clutter-container.h +++ b/clutter/clutter/deprecated/clutter-container.h @@ -23,13 +23,12 @@ * Author: Emmanuele Bassi */ +#pragma once + #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CLUTTER_CONTAINER_DEPRECATED_H__ -#define __CLUTTER_CONTAINER_DEPRECATED_H__ - #include G_BEGIN_DECLS @@ -53,5 +52,3 @@ void clutter_container_remove_actor (ClutterContaine ClutterActor *actor); G_END_DECLS - -#endif /* __CLUTTER_CONTAINER_DEPRECATED_H__ */ diff --git a/clutter/clutter/deprecated/clutter-timeline.h b/clutter/clutter/deprecated/clutter-timeline.h index 169bd7c76..808447064 100644 --- a/clutter/clutter/deprecated/clutter-timeline.h +++ b/clutter/clutter/deprecated/clutter-timeline.h @@ -19,8 +19,7 @@ * License along with this library. If not, see . */ -#ifndef __CLUTTER_TIMELINE_PRIVATE_H__ -#define __CLUTTER_TIMELINE_PRIVATE_H__ +#pragma once #include @@ -30,5 +29,3 @@ CLUTTER_DEPRECATED_FOR(clutter_timeline_new_for_actor) ClutterTimeline * clutter_timeline_new (guint duration_ms); G_END_DECLS - -#endif /* __CLUTTER_TIMELINE_PRIVATE_H__ */ diff --git a/cogl/cogl-pango/cogl-pango-display-list.h b/cogl/cogl-pango/cogl-pango-display-list.h index 03a686ee1..91e4a21c2 100644 --- a/cogl/cogl-pango/cogl-pango-display-list.h +++ b/cogl/cogl-pango/cogl-pango-display-list.h @@ -26,8 +26,7 @@ * SOFTWARE. */ -#ifndef __COGL_PANGO_DISPLAY_LIST_H__ -#define __COGL_PANGO_DISPLAY_LIST_H__ +#pragma once #include #include "cogl-pango-pipeline-cache.h" @@ -80,5 +79,3 @@ void _cogl_pango_display_list_free (CoglPangoDisplayList *dl); G_END_DECLS - -#endif /* __COGL_PANGO_DISPLAY_LIST_H__ */ diff --git a/cogl/cogl-pango/cogl-pango-glyph-cache.h b/cogl/cogl-pango/cogl-pango-glyph-cache.h index a03330dd2..8739c2329 100644 --- a/cogl/cogl-pango/cogl-pango-glyph-cache.h +++ b/cogl/cogl-pango/cogl-pango-glyph-cache.h @@ -26,8 +26,7 @@ * SOFTWARE. */ -#ifndef __COGL_PANGO_GLYPH_CACHE_H__ -#define __COGL_PANGO_GLYPH_CACHE_H__ +#pragma once #include #include @@ -98,5 +97,3 @@ _cogl_pango_glyph_cache_set_dirty_glyphs (CoglPangoGlyphCache *cache, CoglPangoGlyphCacheDirtyFunc func); G_END_DECLS - -#endif /* __COGL_PANGO_GLYPH_CACHE_H__ */ diff --git a/cogl/cogl-pango/cogl-pango-pipeline-cache.h b/cogl/cogl-pango/cogl-pango-pipeline-cache.h index 2cd887812..f7441f0eb 100644 --- a/cogl/cogl-pango/cogl-pango-pipeline-cache.h +++ b/cogl/cogl-pango/cogl-pango-pipeline-cache.h @@ -31,8 +31,7 @@ * Neil Roberts */ -#ifndef __COGL_PANGO_PIPELINE_CACHE_H__ -#define __COGL_PANGO_PIPELINE_CACHE_H__ +#pragma once #include @@ -68,5 +67,3 @@ void _cogl_pango_pipeline_cache_free (CoglPangoPipelineCache *cache); G_END_DECLS - -#endif /* __COGL_PANGO_PIPELINE_CACHE_H__ */ diff --git a/cogl/cogl-pango/cogl-pango-private.h b/cogl/cogl-pango/cogl-pango-private.h index c29100a66..c9ec8a52a 100644 --- a/cogl/cogl-pango/cogl-pango-private.h +++ b/cogl/cogl-pango/cogl-pango-private.h @@ -33,8 +33,7 @@ * Matthew Allum */ -#ifndef __COGL_PANGO_PRIVATE_H__ -#define __COGL_PANGO_PRIVATE_H__ +#pragma once #include "cogl-pango.h" @@ -61,5 +60,3 @@ PangoRenderer * _cogl_pango_font_map_get_renderer (CoglPangoFontMap *fm); G_END_DECLS - -#endif /* __COGL_PANGO_PRIVATE_H__ */ diff --git a/cogl/cogl-pango/cogl-pango.h b/cogl/cogl-pango/cogl-pango.h index e5d30fec6..b50732a4a 100644 --- a/cogl/cogl-pango/cogl-pango.h +++ b/cogl/cogl-pango/cogl-pango.h @@ -32,8 +32,7 @@ * Matthew Allum */ -#ifndef __COGL_PANGO_H__ -#define __COGL_PANGO_H__ +#pragma once #include #include @@ -212,5 +211,3 @@ typedef struct _CoglPangoRendererClass CoglPangoRendererClass; COGL_EXPORT GType cogl_pango_renderer_get_type (void) G_GNUC_CONST; G_END_DECLS - -#endif /* __COGL_PANGO_H__ */ diff --git a/cogl/cogl/cogl-atlas-texture-private.h b/cogl/cogl/cogl-atlas-texture-private.h index 336bf1cfa..56b521cc6 100644 --- a/cogl/cogl/cogl-atlas-texture-private.h +++ b/cogl/cogl/cogl-atlas-texture-private.h @@ -28,8 +28,7 @@ * */ -#ifndef _COGL_ATLAS_TEXTURE_PRIVATE_H_ -#define _COGL_ATLAS_TEXTURE_PRIVATE_H_ +#pragma once #include "cogl-object-private.h" #include "cogl-texture-private.h" @@ -77,5 +76,3 @@ _cogl_atlas_texture_remove_reorganize_callback (CoglContext *ctx, gboolean _cogl_is_atlas_texture (void *object); - -#endif /* _COGL_ATLAS_TEXTURE_PRIVATE_H_ */ diff --git a/cogl/cogl/cogl-atlas-texture.h b/cogl/cogl/cogl-atlas-texture.h index 397d53f5b..082fd6e33 100644 --- a/cogl/cogl/cogl-atlas-texture.h +++ b/cogl/cogl/cogl-atlas-texture.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef _COGL_ATLAS_TEXTURE_H_ -#define _COGL_ATLAS_TEXTURE_H_ - #include #include @@ -240,5 +239,3 @@ COGL_EXPORT gboolean cogl_is_atlas_texture (void *object); G_END_DECLS - -#endif /* _COGL_ATLAS_TEXTURE_H_ */ diff --git a/cogl/cogl/cogl-atlas.h b/cogl/cogl/cogl-atlas.h index 304161046..f175ec874 100644 --- a/cogl/cogl/cogl-atlas.h +++ b/cogl/cogl/cogl-atlas.h @@ -26,8 +26,7 @@ * SOFTWARE. */ -#ifndef __COGL_ATLAS_H -#define __COGL_ATLAS_H +#pragma once #include "cogl-rectangle-map.h" #include "cogl-object-private.h" @@ -101,5 +100,3 @@ _cogl_atlas_remove_reorganize_callback (CoglAtlas *atlas, gboolean _cogl_is_atlas (void *object); - -#endif /* __COGL_ATLAS_H */ diff --git a/cogl/cogl/cogl-attribute-buffer-private.h b/cogl/cogl/cogl-attribute-buffer-private.h index c5e8a276d..85aead85b 100644 --- a/cogl/cogl/cogl-attribute-buffer-private.h +++ b/cogl/cogl/cogl-attribute-buffer-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_ATTRIBUTE_BUFFER_PRIVATE_H -#define __COGL_ATTRIBUTE_BUFFER_PRIVATE_H +#pragma once #include "cogl-buffer-private.h" @@ -40,5 +39,3 @@ struct _CoglAttributeBuffer { CoglBuffer _parent; }; - -#endif /* __COGL_ATTRIBUTE_BUFFER_PRIVATE_H */ diff --git a/cogl/cogl/cogl-attribute-buffer.h b/cogl/cogl/cogl-attribute-buffer.h index 1157f1949..1c2222647 100644 --- a/cogl/cogl/cogl-attribute-buffer.h +++ b/cogl/cogl/cogl-attribute-buffer.h @@ -31,13 +31,12 @@ * Robert Bragg */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_ATTRIBUTE_BUFFER_H__ -#define __COGL_ATTRIBUTE_BUFFER_H__ - /* We forward declare the CoglAttributeBuffer type here to avoid some circular * dependency issues with the following headers. */ @@ -137,5 +136,3 @@ cogl_is_attribute_buffer (void *object); G_END_DECLS -#endif /* __COGL_ATTRIBUTE_BUFFER_H__ */ - diff --git a/cogl/cogl/cogl-attribute-private.h b/cogl/cogl/cogl-attribute-private.h index e97cb7d0f..316255511 100644 --- a/cogl/cogl/cogl-attribute-private.h +++ b/cogl/cogl/cogl-attribute-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_ATTRIBUTE_PRIVATE_H -#define __COGL_ATTRIBUTE_PRIVATE_H +#pragma once #include "cogl-object-private.h" #include "cogl-attribute.h" @@ -134,6 +133,3 @@ _cogl_flush_attributes_state (CoglFramebuffer *framebuffer, int _cogl_attribute_get_n_components (CoglAttribute *attribute); - -#endif /* __COGL_ATTRIBUTE_PRIVATE_H */ - diff --git a/cogl/cogl/cogl-attribute.h b/cogl/cogl/cogl-attribute.h index 732946f95..7580416ef 100644 --- a/cogl/cogl/cogl-attribute.h +++ b/cogl/cogl/cogl-attribute.h @@ -31,13 +31,12 @@ * Robert Bragg */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_ATTRIBUTE_H__ -#define __COGL_ATTRIBUTE_H__ - /* We forward declare the CoglAttribute type here to avoid some circular * dependency issues with the following headers. */ @@ -535,6 +534,3 @@ COGL_EXPORT gboolean cogl_is_attribute (void *object); G_END_DECLS - -#endif /* __COGL_ATTRIBUTE_H__ */ - diff --git a/cogl/cogl/cogl-bitmap-private.h b/cogl/cogl/cogl-bitmap-private.h index ac0e477d8..198642f1f 100644 --- a/cogl/cogl/cogl-bitmap-private.h +++ b/cogl/cogl/cogl-bitmap-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_BITMAP_H -#define __COGL_BITMAP_H +#pragma once #include @@ -176,5 +175,3 @@ _cogl_bitmap_unmap (CoglBitmap *bitmap); CoglContext * _cogl_bitmap_get_context (CoglBitmap *bitmap); - -#endif /* __COGL_BITMAP_H */ diff --git a/cogl/cogl/cogl-bitmap.h b/cogl/cogl/cogl-bitmap.h index 504987f78..f60c37e91 100644 --- a/cogl/cogl/cogl-bitmap.h +++ b/cogl/cogl/cogl-bitmap.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_BITMAP_H__ -#define __COGL_BITMAP_H__ - /* XXX: We forward declare CoglBitmap here to allow for circular * dependencies between some headers */ typedef struct _CoglBitmap CoglBitmap; @@ -274,5 +273,3 @@ COGL_EXPORT uint32_t cogl_bitmap_error_quark (void); G_END_DECLS - -#endif /* __COGL_BITMAP_H__ */ diff --git a/cogl/cogl/cogl-bitmask.h b/cogl/cogl/cogl-bitmask.h index 31a57152c..aa09bafc9 100644 --- a/cogl/cogl/cogl-bitmask.h +++ b/cogl/cogl/cogl-bitmask.h @@ -29,8 +29,7 @@ * Neil Roberts */ -#ifndef __COGL_BITMASK_H -#define __COGL_BITMASK_H +#pragma once #include #include "cogl-util.h" @@ -308,5 +307,3 @@ _cogl_bitmask_popcount_upto (const CoglBitmask *bitmask, } G_END_DECLS - -#endif /* __COGL_BITMASK_H */ diff --git a/cogl/cogl/cogl-blend-string.h b/cogl/cogl/cogl-blend-string.h index 8333abad4..08f6ab2b5 100644 --- a/cogl/cogl/cogl-blend-string.h +++ b/cogl/cogl/cogl-blend-string.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef COGL_BLEND_STRING_H -#define COGL_BLEND_STRING_H +#pragma once #include #include @@ -139,6 +138,3 @@ void _cogl_blend_string_split_rgba_statement (CoglBlendStringStatement *statement, CoglBlendStringStatement *rgb, CoglBlendStringStatement *a); - -#endif /* COGL_BLEND_STRING_H */ - diff --git a/cogl/cogl/cogl-blit.h b/cogl/cogl/cogl-blit.h index d3e0da233..eb4609436 100644 --- a/cogl/cogl/cogl-blit.h +++ b/cogl/cogl/cogl-blit.h @@ -26,8 +26,7 @@ * SOFTWARE. */ -#ifndef __COGL_BLIT_H -#define __COGL_BLIT_H +#pragma once #include #include "cogl-object-private.h" @@ -97,5 +96,3 @@ _cogl_blit (CoglBlitData *data, void _cogl_blit_end (CoglBlitData *data); - -#endif /* __COGL_BLIT_H */ diff --git a/cogl/cogl/cogl-boxed-value.h b/cogl/cogl/cogl-boxed-value.h index 962c13387..2221972b9 100644 --- a/cogl/cogl/cogl-boxed-value.h +++ b/cogl/cogl/cogl-boxed-value.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_BOXED_VALUE_H -#define __COGL_BOXED_VALUE_H +#pragma once #include @@ -114,5 +113,3 @@ void _cogl_boxed_value_set_uniform (CoglContext *ctx, int location, const CoglBoxedValue *value); - -#endif /* __COGL_BOXED_VALUE_H */ diff --git a/cogl/cogl/cogl-buffer-private.h b/cogl/cogl/cogl-buffer-private.h index 1e8113838..c641f2e90 100644 --- a/cogl/cogl/cogl-buffer-private.h +++ b/cogl/cogl/cogl-buffer-private.h @@ -32,8 +32,7 @@ * Robert Bragg */ -#ifndef __COGL_BUFFER_PRIVATE_H__ -#define __COGL_BUFFER_PRIVATE_H__ +#pragma once #include @@ -175,5 +174,3 @@ COGL_EXPORT void _cogl_buffer_unmap_for_fill_or_fallback (CoglBuffer *buffer); G_END_DECLS - -#endif /* __COGL_BUFFER_PRIVATE_H__ */ diff --git a/cogl/cogl/cogl-buffer.h b/cogl/cogl/cogl-buffer.h index f1f906502..02de7e896 100644 --- a/cogl/cogl/cogl-buffer.h +++ b/cogl/cogl/cogl-buffer.h @@ -32,13 +32,12 @@ * Robert Bragg */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_BUFFER_H__ -#define __COGL_BUFFER_H__ - #include G_BEGIN_DECLS @@ -288,5 +287,3 @@ cogl_buffer_set_data (CoglBuffer *buffer, size_t size); G_END_DECLS - -#endif /* __COGL_BUFFER_H__ */ diff --git a/cogl/cogl/cogl-clip-stack.h b/cogl/cogl/cogl-clip-stack.h index 3df72b36e..b06e13ec1 100644 --- a/cogl/cogl/cogl-clip-stack.h +++ b/cogl/cogl/cogl-clip-stack.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_CLIP_STACK_H -#define __COGL_CLIP_STACK_H +#pragma once #include "cogl-primitive.h" #include "cogl-framebuffer.h" @@ -204,5 +203,3 @@ _cogl_clip_stack_ref (CoglClipStack *stack); void _cogl_clip_stack_unref (CoglClipStack *stack); - -#endif /* __COGL_CLIP_STACK_H */ diff --git a/cogl/cogl/cogl-closure-list-private.h b/cogl/cogl/cogl-closure-list-private.h index f4b829ba7..404e202ba 100644 --- a/cogl/cogl/cogl-closure-list-private.h +++ b/cogl/cogl/cogl-closure-list-private.h @@ -27,8 +27,7 @@ * */ -#ifndef _COGL_CLOSURE_LIST_PRIVATE_H_ -#define _COGL_CLOSURE_LIST_PRIVATE_H_ +#pragma once #include "cogl-object.h" #include "cogl-list.h" @@ -114,5 +113,3 @@ _cogl_closure_list_add (CoglList *list, _cb (_c->user_data); \ } \ } G_STMT_END - -#endif /* _COGL_CLOSURE_LIST_PRIVATE_H_ */ diff --git a/cogl/cogl/cogl-color-private.h b/cogl/cogl/cogl-color-private.h index bb1a58e25..6063608cb 100644 --- a/cogl/cogl/cogl-color-private.h +++ b/cogl/cogl/cogl-color-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_COLOR_PRIVATE_PRIVATE_H -#define __COGL_COLOR_PRIVATE_PRIVATE_H +#pragma once #include "cogl-color.h" @@ -47,5 +46,3 @@ void _cogl_color_get_rgba_4ubv (const CoglColor *color, uint8_t *dest); -#endif /* __COGL_COLOR_PRIVATE_PRIVATE_H */ - diff --git a/cogl/cogl/cogl-color.h b/cogl/cogl/cogl-color.h index b03245d63..2fbe963a0 100644 --- a/cogl/cogl/cogl-color.h +++ b/cogl/cogl/cogl-color.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_COLOR_H__ -#define __COGL_COLOR_H__ - /** * SECTION:cogl-color * @short_description: A generic color definition @@ -483,5 +482,3 @@ cogl_color_init_from_hsl (CoglColor *color, float luminance); G_END_DECLS - -#endif /* __COGL_COLOR_H__ */ diff --git a/cogl/cogl/cogl-context-private.h b/cogl/cogl/cogl-context-private.h index e3a463bf2..473fb92e0 100644 --- a/cogl/cogl/cogl-context-private.h +++ b/cogl/cogl/cogl-context-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_CONTEXT_PRIVATE_H -#define __COGL_CONTEXT_PRIVATE_H +#pragma once #include "cogl-context.h" #include "cogl-flags.h" @@ -312,5 +311,3 @@ _cogl_context_set_current_projection_entry (CoglContext *context, void _cogl_context_set_current_modelview_entry (CoglContext *context, CoglMatrixEntry *entry); - -#endif /* __COGL_CONTEXT_PRIVATE_H */ diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h index bd43ae0f2..287019363 100644 --- a/cogl/cogl/cogl-context.h +++ b/cogl/cogl/cogl-context.h @@ -30,13 +30,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_CONTEXT_H__ -#define __COGL_CONTEXT_H__ - /* We forward declare the CoglContext type here to avoid some circular * dependency issues with the following headers. */ @@ -370,6 +369,3 @@ COGL_EXPORT int64_t cogl_context_get_gpu_time_ns (CoglContext *context); G_END_DECLS - -#endif /* __COGL_CONTEXT_H__ */ - diff --git a/cogl/cogl/cogl-debug.h b/cogl/cogl/cogl-debug.h index 766c0e39f..aaafd7394 100644 --- a/cogl/cogl/cogl-debug.h +++ b/cogl/cogl/cogl-debug.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_DEBUG_H__ -#define __COGL_DEBUG_H__ +#pragma once #include "cogl-profile.h" #include "cogl-flags.h" @@ -120,6 +119,3 @@ _cogl_parse_debug_string (const char *value, gboolean ignore_help); G_END_DECLS - -#endif /* __COGL_DEBUG_H__ */ - diff --git a/cogl/cogl/cogl-defines.h.in b/cogl/cogl/cogl-defines.h.in index a438a9622..fe2b3340f 100644 --- a/cogl/cogl/cogl-defines.h.in +++ b/cogl/cogl/cogl-defines.h.in @@ -28,13 +28,10 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_DEFINES_H__ -#define __COGL_DEFINES_H__ - @COGL_DEFINES@ - -#endif diff --git a/cogl/cogl/cogl-depth-state-private.h b/cogl/cogl/cogl-depth-state-private.h index 6c14bb9f2..3e6a0603a 100644 --- a/cogl/cogl/cogl-depth-state-private.h +++ b/cogl/cogl/cogl-depth-state-private.h @@ -29,10 +29,6 @@ * Robert Bragg */ -#ifndef __COGL_DEPTH_STATE_PRIVATE_H -#define __COGL_DEPTH_STATE_PRIVATE_H - +#pragma once #define COGL_DEPTH_STATE_MAGIC 0xDEADBEEF - -#endif /* __COGL_DEPTH_STATE_PRIVATE_H */ diff --git a/cogl/cogl/cogl-depth-state.h b/cogl/cogl/cogl-depth-state.h index 339273f37..0d8fe18fb 100644 --- a/cogl/cogl/cogl-depth-state.h +++ b/cogl/cogl/cogl-depth-state.h @@ -30,13 +30,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_DEPTH_STATE_H__ -#define __COGL_DEPTH_STATE_H__ - G_BEGIN_DECLS /** @@ -223,5 +222,3 @@ cogl_depth_state_get_range (CoglDepthState *state, float *far_val); G_END_DECLS - -#endif /* __COGL_DEPTH_STATE_H__ */ diff --git a/cogl/cogl/cogl-display-private.h b/cogl/cogl/cogl-display-private.h index e20036345..edbcd4369 100644 --- a/cogl/cogl/cogl-display-private.h +++ b/cogl/cogl/cogl-display-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_DISPLAY_PRIVATE_H -#define __COGL_DISPLAY_PRIVATE_H +#pragma once #include "cogl-object-private.h" #include "cogl-display.h" @@ -46,5 +45,3 @@ struct _CoglDisplay void *winsys; }; - -#endif /* __COGL_DISPLAY_PRIVATE_H */ diff --git a/cogl/cogl/cogl-display.h b/cogl/cogl/cogl-display.h index dc06bbc9e..b2d7b8312 100644 --- a/cogl/cogl/cogl-display.h +++ b/cogl/cogl/cogl-display.h @@ -30,13 +30,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_DISPLAY_H__ -#define __COGL_DISPLAY_H__ - #include #include @@ -195,6 +194,3 @@ COGL_EXPORT gboolean cogl_is_display (void *object); G_END_DECLS - -#endif /* __COGL_DISPLAY_H__ */ - diff --git a/cogl/cogl/cogl-dma-buf-handle.h b/cogl/cogl/cogl-dma-buf-handle.h index 408156684..c5ee17779 100644 --- a/cogl/cogl/cogl-dma-buf-handle.h +++ b/cogl/cogl/cogl-dma-buf-handle.h @@ -29,14 +29,12 @@ * Georges Basile Stavracas Neto */ +#pragma once #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_DMA_BUF_HANDLE_H__ -#define __COGL_DMA_BUF_HANDLE_H__ - #include #include @@ -142,5 +140,3 @@ COGL_EXPORT int cogl_dma_buf_handle_get_bpp (CoglDmaBufHandle *dmabuf_handle); G_DEFINE_AUTOPTR_CLEANUP_FUNC (CoglDmaBufHandle, cogl_dma_buf_handle_free) - -#endif /* __COGL_DMA_BUF_HANDLE_H__ */ diff --git a/cogl/cogl/cogl-driver.h b/cogl/cogl/cogl-driver.h index 4b639df87..02d4ab579 100644 --- a/cogl/cogl/cogl-driver.h +++ b/cogl/cogl/cogl-driver.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_DRIVER_H -#define __COGL_DRIVER_H +#pragma once #include "cogl-context.h" #include "cogl-offscreen-private.h" @@ -266,6 +265,3 @@ typedef enum /*< prefix=COGL_DRIVER_ERROR >*/ uint32_t _cogl_driver_error_quark (void); - -#endif /* __COGL_DRIVER_H */ - diff --git a/cogl/cogl/cogl-egl-defines.h.in b/cogl/cogl/cogl-egl-defines.h.in index 648a62ddf..abdc1b9da 100644 --- a/cogl/cogl/cogl-egl-defines.h.in +++ b/cogl/cogl/cogl-egl-defines.h.in @@ -28,13 +28,10 @@ * */ -#ifndef __COGL_EGL_DEFINES_H__ -#define __COGL_EGL_DEFINES_H__ +#pragma once #ifdef COGL_HAS_EGL_SUPPORT @COGL_EGL_INCLUDES@ #endif /* COGL_HAS_EGL_SUPPORT */ - -#endif diff --git a/cogl/cogl/cogl-egl-private.h b/cogl/cogl/cogl-egl-private.h index 0af8518f1..72e1de588 100644 --- a/cogl/cogl/cogl-egl-private.h +++ b/cogl/cogl/cogl-egl-private.h @@ -28,13 +28,10 @@ * */ -#ifndef __COGL_EGL_PRIVATE_H__ -#define __COGL_EGL_PRIVATE_H__ +#pragma once #include "cogl-egl-defines.h" #if defined(GL_OES_EGL_image) && !defined(GLeglImageOES) #define GLeglImageOES void * #endif - -#endif /* __COGL_EGL_PRIVATE_H__ */ diff --git a/cogl/cogl/cogl-egl.h b/cogl/cogl/cogl-egl.h index 0d9b6778f..99a937697 100644 --- a/cogl/cogl/cogl-egl.h +++ b/cogl/cogl/cogl-egl.h @@ -28,32 +28,7 @@ * */ -#ifndef __COGL_EGL_H__ -#define __COGL_EGL_H__ - -/* NB: this is a top-level header that can be included directly but we - * want to be careful not to define __COGL_H_INSIDE__ when this is - * included internally while building Cogl itself since - * __COGL_H_INSIDE__ is used in headers to guard public vs private api - * definitions - */ -#ifndef COGL_COMPILATION - -/* Note: When building Cogl .gir we explicitly define - * __COGL_EGL_H_INSIDE__ */ -#ifndef __COGL_EGL_H_INSIDE__ -#define __COGL_EGL_H_INSIDE__ -#endif - -/* Note: When building Cogl .gir we explicitly define - * __COGL_H_INSIDE__ */ -#ifndef __COGL_H_INSIDE__ -#define __COGL_H_INSIDE__ -#define __COGL_MUST_UNDEF_COGL_H_INSIDE_COGL_EGL__ -#endif - -#endif /* COGL_COMPILATION */ - +#pragma once #include #include @@ -92,5 +67,3 @@ G_END_DECLS #undef __COGL_EGL_H_INSIDE__ #undef __COGL_MUST_UNDEF_COGL_H_INSIDE_COGL_EGL__ #endif - -#endif /* __COGL_EGL_H__ */ diff --git a/cogl/cogl/cogl-feature-private.h b/cogl/cogl/cogl-feature-private.h index 35ec08953..faa232ac9 100644 --- a/cogl/cogl/cogl-feature-private.h +++ b/cogl/cogl/cogl-feature-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_FEATURE_PRIVATE_H -#define __COGL_FEATURE_PRIVATE_H +#pragma once #include @@ -102,5 +101,3 @@ _cogl_feature_check_ext_functions (CoglContext *context, int gl_major, int gl_minor, char * const *gl_extensions); - -#endif /* __COGL_FEATURE_PRIVATE_H */ diff --git a/cogl/cogl/cogl-fence-private.h b/cogl/cogl/cogl-fence-private.h index d2fe839f3..c38e857a9 100644 --- a/cogl/cogl/cogl-fence-private.h +++ b/cogl/cogl/cogl-fence-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_FENCE_PRIVATE_H__ -#define __COGL_FENCE_PRIVATE_H__ +#pragma once #include "cogl-fence.h" #include "cogl-list.h" @@ -62,5 +61,3 @@ _cogl_fence_submit (CoglFenceClosure *fence); void _cogl_fence_cancel_fences_for_framebuffer (CoglFramebuffer *framebuffer); - -#endif /* __COGL_FENCE_PRIVATE_H__ */ diff --git a/cogl/cogl/cogl-fence.h b/cogl/cogl/cogl-fence.h index 15559388e..5e17409f2 100644 --- a/cogl/cogl/cogl-fence.h +++ b/cogl/cogl/cogl-fence.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_FENCE_H__ -#define __COGL_FENCE_H__ - #include #include @@ -121,5 +120,3 @@ cogl_framebuffer_add_fence_callback (CoglFramebuffer *framebuffer, COGL_EXPORT void cogl_framebuffer_cancel_fence_callback (CoglFramebuffer *framebuffer, CoglFenceClosure *closure); - -#endif /* __COGL_FENCE_H__ */ diff --git a/cogl/cogl/cogl-flags.h b/cogl/cogl/cogl-flags.h index 773818dcb..cb2764a4a 100644 --- a/cogl/cogl/cogl-flags.h +++ b/cogl/cogl/cogl-flags.h @@ -29,8 +29,7 @@ * Neil Roberts */ -#ifndef __COGL_FLAGS_H -#define __COGL_FLAGS_H +#pragma once #include @@ -125,6 +124,3 @@ G_BEGIN_DECLS } } } G_STMT_END G_END_DECLS - -#endif /* __COGL_FLAGS_H */ - diff --git a/cogl/cogl/cogl-frame-info-private.h b/cogl/cogl/cogl-frame-info-private.h index 3264ae009..e6d8ca5a1 100644 --- a/cogl/cogl/cogl-frame-info-private.h +++ b/cogl/cogl/cogl-frame-info-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_FRAME_INFO_PRIVATE_H -#define __COGL_FRAME_INFO_PRIVATE_H +#pragma once #include "cogl-frame-info.h" #include "cogl-object-private.h" @@ -90,5 +89,3 @@ CoglFrameInfo *cogl_frame_info_new (CoglContext *context, COGL_EXPORT void cogl_frame_info_set_target_presentation_time (CoglFrameInfo *info, int64_t presentation_time_us); - -#endif /* __COGL_FRAME_INFO_PRIVATE_H */ diff --git a/cogl/cogl/cogl-frame-info.h b/cogl/cogl/cogl-frame-info.h index ab10783b1..22994f939 100644 --- a/cogl/cogl/cogl-frame-info.h +++ b/cogl/cogl/cogl-frame-info.h @@ -30,13 +30,13 @@ * Authors: * Owen Taylor */ + +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_FRAME_INFO_H -#define __COGL_FRAME_INFO_H - #include #include @@ -149,5 +149,3 @@ COGL_EXPORT int64_t cogl_frame_info_get_time_before_buffer_swap_us (CoglFrameInfo *info); G_END_DECLS - -#endif /* __COGL_FRAME_INFO_H */ diff --git a/cogl/cogl/cogl-framebuffer-driver.h b/cogl/cogl/cogl-framebuffer-driver.h index d8815234b..2bdc249a6 100644 --- a/cogl/cogl/cogl-framebuffer-driver.h +++ b/cogl/cogl/cogl-framebuffer-driver.h @@ -25,8 +25,7 @@ * */ -#ifndef COGL_FRAMEBUFFER_DRIVER_H -#define COGL_FRAMEBUFFER_DRIVER_H +#pragma once #include "cogl-attribute-private.h" #include "cogl-framebuffer.h" @@ -140,5 +139,3 @@ cogl_framebuffer_driver_read_pixels_into_bitmap (CoglFramebufferDriver *driver, CoglReadPixelsFlags source, CoglBitmap *bitmap, GError **error); - -#endif /* COGL_FRAMEBUFFER_DRIVER_H */ diff --git a/cogl/cogl/cogl-framebuffer-private.h b/cogl/cogl/cogl-framebuffer-private.h index f83268d2f..462b4cbe8 100644 --- a/cogl/cogl/cogl-framebuffer-private.h +++ b/cogl/cogl/cogl-framebuffer-private.h @@ -29,8 +29,7 @@ * */ -#ifndef __COGL_FRAMEBUFFER_PRIVATE_H -#define __COGL_FRAMEBUFFER_PRIVATE_H +#pragma once #include "cogl-framebuffer-driver.h" #include "cogl-object-private.h" @@ -313,5 +312,3 @@ cogl_framebuffer_get_driver (CoglFramebuffer *framebuffer); */ gboolean cogl_framebuffer_is_y_flipped (CoglFramebuffer *framebuffer); - -#endif /* __COGL_FRAMEBUFFER_PRIVATE_H */ diff --git a/cogl/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h index 3c7f472df..d1d758067 100644 --- a/cogl/cogl/cogl-framebuffer.h +++ b/cogl/cogl/cogl-framebuffer.h @@ -32,9 +32,7 @@ * Robert Bragg */ -#ifndef __COGL_FRAMEBUFFER_H -#define __COGL_FRAMEBUFFER_H - +#pragma once #include #include @@ -1382,5 +1380,3 @@ COGL_EXPORT CoglTimestampQuery * cogl_framebuffer_create_timestamp_query (CoglFramebuffer *framebuffer); G_END_DECLS - -#endif /* __COGL_FRAMEBUFFER_H */ diff --git a/cogl/cogl/cogl-gl-header.h.in b/cogl/cogl/cogl-gl-header.h.in index a6659e92f..e2d15da62 100644 --- a/cogl/cogl/cogl-gl-header.h.in +++ b/cogl/cogl/cogl-gl-header.h.in @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(COGL_COMPILATION) && !defined(COGL_ENABLE_MUTTER_API) #error "cogl-gl-header.h should only be included when compiling Cogl" #endif -#ifndef __COGL_GL_HEADER_H__ -#define __COGL_GL_HEADER_H__ - #include "cogl-defines.h" @COGL_GL_HEADER_INCLUDES@ @@ -42,5 +41,3 @@ #ifndef GL_OES_EGL_image #define GLeglImageOES void * #endif - -#endif /* __COGL_GL_HEADER_H__ */ diff --git a/cogl/cogl/cogl-glib-source.h b/cogl/cogl/cogl-glib-source.h index c0001fbd3..211c13b01 100644 --- a/cogl/cogl/cogl-glib-source.h +++ b/cogl/cogl/cogl-glib-source.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_GSOURCE_H__ -#define __COGL_GSOURCE_H__ - #include #include @@ -87,5 +86,3 @@ cogl_glib_renderer_source_new (CoglRenderer *renderer, int priority); G_END_DECLS - -#endif /* __COGL_GSOURCE_H__ */ diff --git a/cogl/cogl/cogl-glsl-shader-boilerplate.h b/cogl/cogl/cogl-glsl-shader-boilerplate.h index 6d882dad2..f5be36b3e 100644 --- a/cogl/cogl/cogl-glsl-shader-boilerplate.h +++ b/cogl/cogl/cogl-glsl-shader-boilerplate.h @@ -30,8 +30,7 @@ * Robert Bragg */ -#ifndef __COGL_SHADER_BOILERPLATE_H -#define __COGL_SHADER_BOILERPLATE_H +#pragma once #define _COGL_COMMON_SHADER_BOILERPLATE \ "#define COGL_VERSION 100\n" \ @@ -81,6 +80,3 @@ * more appropriate for Cogl. */ "#define coglFragCoord gl_FragCoord\n" #endif - -#endif /* __COGL_SHADER_BOILERPLATE_H */ - diff --git a/cogl/cogl/cogl-graphene.h b/cogl/cogl/cogl-graphene.h index 5de72d6fd..19ec9eb36 100644 --- a/cogl/cogl/cogl-graphene.h +++ b/cogl/cogl/cogl-graphene.h @@ -26,8 +26,7 @@ * */ -#ifndef COGL_GRAPHENE_H -#define COGL_GRAPHENE_H +#pragma once #include #include @@ -168,5 +167,3 @@ cogl_graphene_matrix_project_points (const graphene_matrix_t *matrix, int n_points); G_END_DECLS - -#endif /* COGL_GRAPHENE_H */ diff --git a/cogl/cogl/cogl-gtype-private.h b/cogl/cogl/cogl-gtype-private.h index 1926f3f62..2ec59ee65 100644 --- a/cogl/cogl/cogl-gtype-private.h +++ b/cogl/cogl/cogl-gtype-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_GTYPE_PRIVATE_H__ -#define __COGL_GTYPE_PRIVATE_H__ +#pragma once #include "cogl-config.h" @@ -276,5 +275,3 @@ COGL_EXPORT gpointer cogl_object_value_get_object (const GValue *value); void _cogl_gtype_dummy_iface_init (gpointer iface); - -#endif /* __COGL_GTYPE_PRIVATE_H__ */ diff --git a/cogl/cogl/cogl-i18n-private.h b/cogl/cogl/cogl-i18n-private.h index 94202f791..8d3edd4fe 100644 --- a/cogl/cogl/cogl-i18n-private.h +++ b/cogl/cogl/cogl-i18n-private.h @@ -28,12 +28,9 @@ * */ -#ifndef _COGL_I18N_PRIVATE_H_ -#define _COGL_I18N_PRIVATE_H_ +#pragma once #include #define _(X) X #define N_(X) X - -#endif /* _COGL_I18N_PRIVATE_H_ */ diff --git a/cogl/cogl/cogl-index-buffer-private.h b/cogl/cogl/cogl-index-buffer-private.h index d9596cd83..52450473e 100644 --- a/cogl/cogl/cogl-index-buffer-private.h +++ b/cogl/cogl/cogl-index-buffer-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_INDEX_BUFFER_PRIVATE_H -#define __COGL_INDEX_BUFFER_PRIVATE_H +#pragma once #include "cogl-buffer-private.h" @@ -40,5 +39,3 @@ struct _CoglIndexBuffer { CoglBuffer _parent; }; - -#endif /* __COGL_INDEX_BUFFER_PRIVATE_H */ diff --git a/cogl/cogl/cogl-index-buffer.h b/cogl/cogl/cogl-index-buffer.h index 2bddbf3aa..9ccef324c 100644 --- a/cogl/cogl/cogl-index-buffer.h +++ b/cogl/cogl/cogl-index-buffer.h @@ -31,13 +31,12 @@ * Robert Bragg */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_INDEX_BUFFER_H__ -#define __COGL_INDEX_BUFFER_H__ - #include #include @@ -92,6 +91,3 @@ COGL_EXPORT gboolean cogl_is_index_buffer (void *object); G_END_DECLS - -#endif /* __COGL_INDEX_BUFFER_H__ */ - diff --git a/cogl/cogl/cogl-indices-private.h b/cogl/cogl/cogl-indices-private.h index 3d5891687..53b2c8c2f 100644 --- a/cogl/cogl/cogl-indices-private.h +++ b/cogl/cogl/cogl-indices-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_INDICES_PRIVATE_H -#define __COGL_INDICES_PRIVATE_H +#pragma once #include "cogl-object-private.h" #include "cogl-index-buffer-private.h" @@ -55,6 +54,3 @@ _cogl_indices_immutable_ref (CoglIndices *indices); void _cogl_indices_immutable_unref (CoglIndices *indices); - -#endif /* __COGL_INDICES_PRIVATE_H */ - diff --git a/cogl/cogl/cogl-indices.h b/cogl/cogl/cogl-indices.h index 14f0d646d..4153f335c 100644 --- a/cogl/cogl/cogl-indices.h +++ b/cogl/cogl/cogl-indices.h @@ -31,13 +31,12 @@ * Robert Bragg */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_INDICES_H__ -#define __COGL_INDICES_H__ - /* We forward declare the CoglIndices type here to avoid some circular * dependency issues with the following headers. */ @@ -155,6 +154,3 @@ COGL_EXPORT gboolean cogl_is_indices (void *object); G_END_DECLS - -#endif /* __COGL_INDICES_H__ */ - diff --git a/cogl/cogl/cogl-journal-private.h b/cogl/cogl/cogl-journal-private.h index 21214a6d0..8484d6b47 100644 --- a/cogl/cogl/cogl-journal-private.h +++ b/cogl/cogl/cogl-journal-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_JOURNAL_PRIVATE_H -#define __COGL_JOURNAL_PRIVATE_H +#pragma once #include "cogl-texture.h" #include "cogl-object-private.h" @@ -120,5 +119,3 @@ _cogl_journal_try_read_pixel (CoglJournal *journal, gboolean _cogl_is_journal (void *object); - -#endif /* __COGL_JOURNAL_PRIVATE_H */ diff --git a/cogl/cogl/cogl-list.h b/cogl/cogl/cogl-list.h index 20cbec82a..9d52ce51a 100644 --- a/cogl/cogl/cogl-list.h +++ b/cogl/cogl/cogl-list.h @@ -21,10 +21,9 @@ * OF THIS SOFTWARE. */ -/* This list implementation is based on the Wayland source code */ +#pragma once -#ifndef COGL_LIST_H -#define COGL_LIST_H +/* This list implementation is based on the Wayland source code */ #include @@ -125,5 +124,3 @@ _cogl_list_insert_list (CoglList *list, &pos->member != (head); \ pos = tmp, \ _cogl_list_set_iterator (pos->member.prev, tmp, member)) - -#endif /* COGL_LIST_H */ diff --git a/cogl/cogl/cogl-macros.h b/cogl/cogl/cogl-macros.h index f7001d811..895a597c0 100644 --- a/cogl/cogl/cogl-macros.h +++ b/cogl/cogl/cogl-macros.h @@ -26,13 +26,12 @@ * SOFTWARE. */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_MACROS_H__ -#define __COGL_MACROS_H__ - /* These macros are used to mark deprecated functions, and thus have * to be exposed in a public header. * @@ -75,5 +74,3 @@ #define COGL_EXPORT __attribute__((visibility("default"))) extern #define COGL_EXPORT_TEST __attribute__((visibility("default"))) extern - -#endif /* __COGL_MACROS_H__ */ diff --git a/cogl/cogl/cogl-magazine-private.h b/cogl/cogl/cogl-magazine-private.h index 091801be1..bc60af6c6 100644 --- a/cogl/cogl/cogl-magazine-private.h +++ b/cogl/cogl/cogl-magazine-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_MAGAZINE_PRIVATE_H__ -#define __COGL_MAGAZINE_PRIVATE_H__ +#pragma once #include @@ -77,5 +76,3 @@ _cogl_magazine_chunk_free (CoglMagazine *magazine, void *data) void _cogl_magazine_free (CoglMagazine *magazine); - -#endif /* __COGL_MAGAZINE_PRIVATE_H__ */ diff --git a/cogl/cogl/cogl-matrix-stack-private.h b/cogl/cogl/cogl-matrix-stack-private.h index cb0885199..3778f60f0 100644 --- a/cogl/cogl/cogl-matrix-stack-private.h +++ b/cogl/cogl/cogl-matrix-stack-private.h @@ -32,8 +32,7 @@ * Robert Bragg */ -#ifndef _COGL_MATRIX_STACK_PRIVATE_H_ -#define _COGL_MATRIX_STACK_PRIVATE_H_ +#pragma once #include "cogl-object-private.h" #include "cogl-matrix-stack.h" @@ -164,5 +163,3 @@ _cogl_matrix_entry_cache_maybe_update (CoglMatrixEntryCache *cache, void _cogl_matrix_entry_cache_destroy (CoglMatrixEntryCache *cache); - -#endif /* _COGL_MATRIX_STACK_PRIVATE_H_ */ diff --git a/cogl/cogl/cogl-matrix-stack.h b/cogl/cogl/cogl-matrix-stack.h index 3e330916f..325462b7a 100644 --- a/cogl/cogl/cogl-matrix-stack.h +++ b/cogl/cogl/cogl-matrix-stack.h @@ -32,8 +32,7 @@ * Robert Bragg */ -#ifndef _COGL_MATRIX_STACK_H_ -#define _COGL_MATRIX_STACK_H_ +#pragma once #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." @@ -627,5 +626,3 @@ cogl_matrix_entry_ref (CoglMatrixEntry *entry); */ COGL_EXPORT void cogl_matrix_entry_unref (CoglMatrixEntry *entry); - -#endif /* _COGL_MATRIX_STACK_H_ */ diff --git a/cogl/cogl/cogl-memory-stack-private.h b/cogl/cogl/cogl-memory-stack-private.h index 2b6ee828c..0b5e406ea 100644 --- a/cogl/cogl/cogl-memory-stack-private.h +++ b/cogl/cogl/cogl-memory-stack-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_MEMORY_STACK__ -#define __COGL_MEMORY_STACK__ +#pragma once #include @@ -46,5 +45,3 @@ _cogl_memory_stack_rewind (CoglMemoryStack *stack); void _cogl_memory_stack_free (CoglMemoryStack *stack); - -#endif /* __COGL_MEMORY_STACK__ */ diff --git a/cogl/cogl/cogl-meta-texture.h b/cogl/cogl/cogl-meta-texture.h index 686e77d89..8d90c3333 100644 --- a/cogl/cogl/cogl-meta-texture.h +++ b/cogl/cogl/cogl-meta-texture.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_META_TEXTURE_H__ -#define __COGL_META_TEXTURE_H__ - #include G_BEGIN_DECLS @@ -183,5 +182,3 @@ cogl_meta_texture_foreach_in_region (CoglMetaTexture *meta_texture, void *user_data); G_END_DECLS - -#endif /* __COGL_META_TEXTURE_H__ */ diff --git a/cogl/cogl/cogl-mutter.h b/cogl/cogl/cogl-mutter.h index d6e55a1b1..27d75c57e 100644 --- a/cogl/cogl/cogl-mutter.h +++ b/cogl/cogl/cogl-mutter.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_MUTTER_H___ -#define __COGL_MUTTER_H___ +#pragma once #include "cogl-config.h" #include "cogl-defines.h" @@ -61,5 +60,3 @@ void cogl_renderer_set_custom_winsys (CoglRenderer *renderer, COGL_EXPORT gboolean cogl_context_format_supports_upload (CoglContext *ctx, CoglPixelFormat format); - -#endif /* __COGL_MUTTER_H___ */ diff --git a/cogl/cogl/cogl-node-private.h b/cogl/cogl/cogl-node-private.h index b167f05f1..0187e9c4a 100644 --- a/cogl/cogl/cogl-node-private.h +++ b/cogl/cogl/cogl-node-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_NODE_PRIVATE_H -#define __COGL_NODE_PRIVATE_H +#pragma once #include "cogl-object-private.h" #include "cogl-list.h" @@ -85,5 +84,3 @@ void _cogl_pipeline_node_foreach_child (CoglNode *node, CoglNodeChildCallback callback, void *user_data); - -#endif /* __COGL_NODE_PRIVATE_H */ diff --git a/cogl/cogl/cogl-object-private.h b/cogl/cogl/cogl-object-private.h index ac24f188c..d215b4fde 100644 --- a/cogl/cogl/cogl-object-private.h +++ b/cogl/cogl/cogl-object-private.h @@ -29,8 +29,7 @@ * Robert Bragg */ -#ifndef __COGL_OBJECT_PRIVATE_H -#define __COGL_OBJECT_PRIVATE_H +#pragma once #include @@ -277,6 +276,3 @@ _cogl_object_set_user_data (CoglObject *object, COGL_EXPORT void _cogl_object_default_unref (void *obj); - -#endif /* __COGL_OBJECT_PRIVATE_H */ - diff --git a/cogl/cogl/cogl-object.h b/cogl/cogl/cogl-object.h index 92681ca91..77f9f5e02 100644 --- a/cogl/cogl/cogl-object.h +++ b/cogl/cogl/cogl-object.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_OBJECT_H -#define __COGL_OBJECT_H +#pragma once #include @@ -226,6 +225,3 @@ COGL_EXPORT void cogl_debug_object_print_instances (void); G_END_DECLS - -#endif /* __COGL_OBJECT_H */ - diff --git a/cogl/cogl/cogl-offscreen-private.h b/cogl/cogl/cogl-offscreen-private.h index c88fc8535..597b8ceba 100644 --- a/cogl/cogl/cogl-offscreen-private.h +++ b/cogl/cogl/cogl-offscreen-private.h @@ -25,8 +25,7 @@ * */ -#ifndef COGL_OFFSCREEN_PRIVATE_H -#define COGL_OFFSCREEN_PRIVATE_H +#pragma once #include "cogl-gl-header.h" #include "cogl-offscreen.h" @@ -64,5 +63,3 @@ _cogl_offscreen_new_with_texture_full (CoglTexture *texture, int cogl_offscreen_get_texture_level (CoglOffscreen *offscreen); - -#endif /* COGL_OFFSCREEN_PRIVATE_H */ diff --git a/cogl/cogl/cogl-offscreen.h b/cogl/cogl/cogl-offscreen.h index 2fa21dcc4..8de4f6153 100644 --- a/cogl/cogl/cogl-offscreen.h +++ b/cogl/cogl/cogl-offscreen.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_OFFSCREEN_H__ -#define __COGL_OFFSCREEN_H__ - #include #include @@ -100,5 +99,3 @@ COGL_EXPORT CoglTexture * cogl_offscreen_get_texture (CoglOffscreen *offscreen); G_END_DECLS - -#endif /* __COGL_OFFSCREEN_H__ */ diff --git a/cogl/cogl/cogl-onscreen-private.h b/cogl/cogl/cogl-onscreen-private.h index dffe018d2..e50b5b22e 100644 --- a/cogl/cogl/cogl-onscreen-private.h +++ b/cogl/cogl/cogl-onscreen-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_ONSCREEN_PRIVATE_H -#define __COGL_ONSCREEN_PRIVATE_H +#pragma once #include "cogl-onscreen.h" #include "cogl-framebuffer-private.h" @@ -96,5 +95,3 @@ cogl_onscreen_peek_tail_frame_info (CoglOnscreen *onscreen); COGL_EXPORT CoglFrameInfo * cogl_onscreen_pop_head_frame_info (CoglOnscreen *onscreen); - -#endif /* __COGL_ONSCREEN_PRIVATE_H */ diff --git a/cogl/cogl/cogl-onscreen-template-private.h b/cogl/cogl/cogl-onscreen-template-private.h index 1b19d35d7..1fdf7e2b2 100644 --- a/cogl/cogl/cogl-onscreen-template-private.h +++ b/cogl/cogl/cogl-onscreen-template-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_ONSCREEN_TEMPLATE_PRIVATE_H -#define __COGL_ONSCREEN_TEMPLATE_PRIVATE_H +#pragma once #include "cogl-object-private.h" #include "cogl-swap-chain.h" @@ -41,5 +40,3 @@ struct _CoglOnscreenTemplate CoglFramebufferConfig config; }; - -#endif /* __COGL_ONSCREEN_TEMPLATE_PRIVATE_H */ diff --git a/cogl/cogl/cogl-onscreen-template.h b/cogl/cogl/cogl-onscreen-template.h index 8c948737c..ad7c5f84c 100644 --- a/cogl/cogl/cogl-onscreen-template.h +++ b/cogl/cogl/cogl-onscreen-template.h @@ -30,13 +30,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_ONSCREEN_TEMPLATE_H__ -#define __COGL_ONSCREEN_TEMPLATE_H__ - #include #include @@ -111,5 +110,3 @@ COGL_EXPORT gboolean cogl_is_onscreen_template (void *object); G_END_DECLS - -#endif /* __COGL_ONSCREEN_TEMPLATE_H__ */ diff --git a/cogl/cogl/cogl-onscreen.h b/cogl/cogl/cogl-onscreen.h index eea38292c..55736b922 100644 --- a/cogl/cogl/cogl-onscreen.h +++ b/cogl/cogl/cogl-onscreen.h @@ -31,13 +31,12 @@ * Robert Bragg */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_ONSCREEN_H -#define __COGL_ONSCREEN_H - #include #include #include @@ -583,5 +582,3 @@ COGL_EXPORT int64_t cogl_onscreen_get_frame_counter (CoglOnscreen *onscreen); G_END_DECLS - -#endif /* __COGL_ONSCREEN_H */ diff --git a/cogl/cogl/cogl-output-private.h b/cogl/cogl/cogl-output-private.h index 4f8b60ed5..8dfbb9cd3 100644 --- a/cogl/cogl/cogl-output-private.h +++ b/cogl/cogl/cogl-output-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_OUTPUT_PRIVATE_H -#define __COGL_OUTPUT_PRIVATE_H +#pragma once #include "cogl-output.h" #include "cogl-object-private.h" @@ -53,5 +52,3 @@ struct _CoglOutput CoglOutput *_cogl_output_new (const char *name); gboolean _cogl_output_values_equal (CoglOutput *output, CoglOutput *other); - -#endif /* __COGL_OUTPUT_PRIVATE_H */ diff --git a/cogl/cogl/cogl-output.h b/cogl/cogl/cogl-output.h index 583c05e49..dbbe63b3e 100644 --- a/cogl/cogl/cogl-output.h +++ b/cogl/cogl/cogl-output.h @@ -30,13 +30,13 @@ * Authors: * Owen Taylor */ + +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_OUTPUT_H -#define __COGL_OUTPUT_H - #include #include @@ -231,8 +231,3 @@ COGL_EXPORT float cogl_output_get_refresh_rate (CoglOutput *output); G_END_DECLS - -#endif /* __COGL_OUTPUT_H */ - - - diff --git a/cogl/cogl/cogl-pipeline-cache-private.h b/cogl/cogl/cogl-pipeline-cache-private.h index 9e0f480f8..f105c7eaf 100644 --- a/cogl/cogl/cogl-pipeline-cache-private.h +++ b/cogl/cogl/cogl-pipeline-cache-private.h @@ -26,8 +26,7 @@ * SOFTWARE. */ -#ifndef COGL_PIPELINE_CACHE_PRIVATE_H -#define COGL_PIPELINE_CACHE_PRIVATE_H +#pragma once #include "cogl/cogl-macros.h" #include "cogl/cogl-pipeline-hash-table.h" @@ -38,5 +37,3 @@ CoglPipelineHashTable * cogl_pipeline_cache_get_fragment_hash (CoglPipelineCache COGL_EXPORT_TEST CoglPipelineHashTable * cogl_pipeline_cache_get_combined_hash (CoglPipelineCache *cache); - -#endif /* COGL_PIPELINE_CACHE_PRIVATE_H */ diff --git a/cogl/cogl/cogl-pipeline-cache.h b/cogl/cogl/cogl-pipeline-cache.h index bd5862ee5..b7752e438 100644 --- a/cogl/cogl/cogl-pipeline-cache.h +++ b/cogl/cogl/cogl-pipeline-cache.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_PIPELINE_CACHE_H__ -#define __COGL_PIPELINE_CACHE_H__ +#pragma once #include "cogl-pipeline.h" @@ -89,5 +88,3 @@ _cogl_pipeline_cache_get_vertex_template (CoglPipelineCache *cache, CoglPipelineCacheEntry * _cogl_pipeline_cache_get_combined_template (CoglPipelineCache *cache, CoglPipeline *key_pipeline); - -#endif /* __COGL_PIPELINE_CACHE_H__ */ diff --git a/cogl/cogl/cogl-pipeline-hash-table.h b/cogl/cogl/cogl-pipeline-hash-table.h index 035e8dfb3..a3f2c94f2 100644 --- a/cogl/cogl/cogl-pipeline-hash-table.h +++ b/cogl/cogl/cogl-pipeline-hash-table.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_PIPELINE_HASH_H__ -#define __COGL_PIPELINE_HASH_H__ +#pragma once #include "cogl-pipeline-cache.h" @@ -77,5 +76,3 @@ _cogl_pipeline_hash_table_destroy (CoglPipelineHashTable *hash); CoglPipelineCacheEntry * _cogl_pipeline_hash_table_get (CoglPipelineHashTable *hash, CoglPipeline *key_pipeline); - -#endif /* __COGL_PIPELINE_HASH_H__ */ diff --git a/cogl/cogl/cogl-pipeline-layer-private.h b/cogl/cogl/cogl-pipeline-layer-private.h index c89e80e21..24dab4ba1 100644 --- a/cogl/cogl/cogl-pipeline-layer-private.h +++ b/cogl/cogl/cogl-pipeline-layer-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_PIPELINE_LAYER_PRIVATE_H -#define __COGL_PIPELINE_LAYER_PRIVATE_H +#pragma once #include "cogl-private.h" #include "cogl-pipeline.h" @@ -362,5 +361,3 @@ _cogl_pipeline_layer_get_unit_index (CoglPipelineLayer *layer); gboolean _cogl_pipeline_layer_needs_combine_separate (CoglPipelineLayer *combine_authority); - -#endif /* __COGL_PIPELINE_LAYER_PRIVATE_H */ diff --git a/cogl/cogl/cogl-pipeline-layer-state-private.h b/cogl/cogl/cogl-pipeline-layer-state-private.h index a09208964..da2c068cb 100644 --- a/cogl/cogl/cogl-pipeline-layer-state-private.h +++ b/cogl/cogl/cogl-pipeline-layer-state-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_PIPELINE_LAYER_STATE_PRIVATE_H -#define __COGL_PIPELINE_LAYER_STATE_PRIVATE_H +#pragma once #include "cogl-pipeline-layer-state.h" #include "cogl-pipeline-private.h" @@ -127,5 +126,3 @@ void _cogl_pipeline_layer_hash_fragment_snippets_state (CoglPipelineLayer *authority, CoglPipelineLayer **authorities, CoglPipelineHashState *state); - -#endif /* __COGL_PIPELINE_LAYER_STATE_PRIVATE_H */ diff --git a/cogl/cogl/cogl-pipeline-layer-state.h b/cogl/cogl/cogl-pipeline-layer-state.h index c7b068464..fe83164e8 100644 --- a/cogl/cogl/cogl-pipeline-layer-state.h +++ b/cogl/cogl/cogl-pipeline-layer-state.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_PIPELINE_LAYER_STATE_H__ -#define __COGL_PIPELINE_LAYER_STATE_H__ - #include #include #include @@ -497,5 +496,3 @@ cogl_pipeline_set_layer_max_mipmap_level (CoglPipeline *pipeline, int max_level); G_END_DECLS - -#endif /* __COGL_PIPELINE_LAYER_STATE_H__ */ diff --git a/cogl/cogl/cogl-pipeline-private.h b/cogl/cogl/cogl-pipeline-private.h index 045af8fa0..44ee9ef90 100644 --- a/cogl/cogl/cogl-pipeline-private.h +++ b/cogl/cogl/cogl-pipeline-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_PIPELINE_PRIVATE_H -#define __COGL_PIPELINE_PRIVATE_H +#pragma once #include "cogl-node-private.h" #include "cogl-pipeline-layer-private.h" @@ -816,6 +815,3 @@ _cogl_pipeline_get_layer_state_for_fragment_codegen (CoglContext *context); CoglPipelineState _cogl_pipeline_get_state_for_fragment_codegen (CoglContext *context); - -#endif /* __COGL_PIPELINE_PRIVATE_H */ - diff --git a/cogl/cogl/cogl-pipeline-snippet-private.h b/cogl/cogl/cogl-pipeline-snippet-private.h index 9207f2036..65bf0b6a3 100644 --- a/cogl/cogl/cogl-pipeline-snippet-private.h +++ b/cogl/cogl/cogl-pipeline-snippet-private.h @@ -31,8 +31,7 @@ * Neil Roberts */ -#ifndef __COGL_PIPELINE_SNIPPET_PRIVATE_H -#define __COGL_PIPELINE_SNIPPET_PRIVATE_H +#pragma once #include @@ -111,6 +110,3 @@ _cogl_pipeline_snippet_list_hash (CoglPipelineSnippetList *list, gboolean _cogl_pipeline_snippet_list_equal (CoglPipelineSnippetList *list0, CoglPipelineSnippetList *list1); - -#endif /* __COGL_PIPELINE_SNIPPET_PRIVATE_H */ - diff --git a/cogl/cogl/cogl-pipeline-state-private.h b/cogl/cogl/cogl-pipeline-state-private.h index e49fe8a45..e07840dee 100644 --- a/cogl/cogl/cogl-pipeline-state-private.h +++ b/cogl/cogl/cogl-pipeline-state-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_PIPELINE_STATE_PRIVATE_H -#define __COGL_PIPELINE_STATE_PRIVATE_H +#pragma once CoglPipeline * _cogl_pipeline_get_user_program (CoglPipeline *pipeline); @@ -168,5 +167,3 @@ void _cogl_pipeline_compare_uniform_differences (unsigned long *differences, CoglPipeline *pipeline0, CoglPipeline *pipeline1); - -#endif /* __COGL_PIPELINE_STATE_PRIVATE_H */ diff --git a/cogl/cogl/cogl-pipeline-state.h b/cogl/cogl/cogl-pipeline-state.h index e993f13bf..99d665ee4 100644 --- a/cogl/cogl/cogl-pipeline-state.h +++ b/cogl/cogl/cogl-pipeline-state.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_PIPELINE_STATE_H__ -#define __COGL_PIPELINE_STATE_H__ - #include #include #include @@ -667,5 +666,3 @@ cogl_pipeline_add_snippet (CoglPipeline *pipeline, CoglSnippet *snippet); G_END_DECLS - -#endif /* __COGL_PIPELINE_STATE_H__ */ diff --git a/cogl/cogl/cogl-pipeline.h b/cogl/cogl/cogl-pipeline.h index d24d8dc83..59cff675f 100644 --- a/cogl/cogl/cogl-pipeline.h +++ b/cogl/cogl/cogl-pipeline.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_PIPELINE_H__ -#define __COGL_PIPELINE_H__ - /* We forward declare the CoglPipeline type here to avoid some circular * dependency issues with the following headers. */ @@ -164,5 +163,3 @@ cogl_pipeline_get_uniform_location (CoglPipeline *pipeline, const char *uniform_name); G_END_DECLS - -#endif /* __COGL_PIPELINE_H__ */ diff --git a/cogl/cogl/cogl-pixel-buffer-private.h b/cogl/cogl/cogl-pixel-buffer-private.h index 3e5100336..70951fc23 100644 --- a/cogl/cogl/cogl-pixel-buffer-private.h +++ b/cogl/cogl/cogl-pixel-buffer-private.h @@ -32,8 +32,7 @@ * Robert Bragg */ -#ifndef __COGL_PIXEL_BUFFER_PRIVATE_H__ -#define __COGL_PIXEL_BUFFER_PRIVATE_H__ +#pragma once #include "cogl-object-private.h" #include "cogl-buffer-private.h" @@ -48,5 +47,3 @@ struct _CoglPixelBuffer }; G_END_DECLS - -#endif /* __COGL_PIXEL_BUFFER_PRIVATE_H__ */ diff --git a/cogl/cogl/cogl-pixel-buffer.h b/cogl/cogl/cogl-pixel-buffer.h index 297ff335e..966c36e4f 100644 --- a/cogl/cogl/cogl-pixel-buffer.h +++ b/cogl/cogl/cogl-pixel-buffer.h @@ -32,13 +32,12 @@ * Robert Bragg */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_PIXEL_BUFFER_H__ -#define __COGL_PIXEL_BUFFER_H__ - /* XXX: We forward declare CoglPixelBuffer here to allow for circular * dependencies between some headers */ typedef struct _CoglPixelBuffer CoglPixelBuffer; @@ -98,5 +97,3 @@ COGL_EXPORT gboolean cogl_is_pixel_buffer (void *object); G_END_DECLS - -#endif /* __COGL_PIXEL_BUFFER_H__ */ diff --git a/cogl/cogl/cogl-pixel-format.h b/cogl/cogl/cogl-pixel-format.h index 51304e9d7..6170db465 100644 --- a/cogl/cogl/cogl-pixel-format.h +++ b/cogl/cogl/cogl-pixel-format.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_PIXEL_FORMAT_H__ -#define __COGL_PIXEL_FORMAT_H__ - #include #include @@ -352,5 +351,3 @@ COGL_EXPORT const char * cogl_pixel_format_to_string (CoglPixelFormat format); G_END_DECLS - -#endif /* __COGL_PIXEL_FORMAT_H__ */ diff --git a/cogl/cogl/cogl-point-in-poly-private.h b/cogl/cogl/cogl-point-in-poly-private.h index 9b6b21953..862a2fbd0 100644 --- a/cogl/cogl/cogl-point-in-poly-private.h +++ b/cogl/cogl/cogl-point-in-poly-private.h @@ -26,8 +26,7 @@ * SOFTWARE. */ -#ifndef __COGL_POINT_INT_POLYGON_PRIVATE_H -#define __COGL_POINT_INT_POLYGON_PRIVATE_H +#pragma once #include @@ -41,6 +40,3 @@ _cogl_util_point_in_screen_poly (float point_x, int n_vertices); G_END_DECLS - -#endif /* __COGL_POINT_INT_POLYGON_PRIVATE_H */ - diff --git a/cogl/cogl/cogl-poll-private.h b/cogl/cogl/cogl-poll-private.h index 55021926e..c06e6effb 100644 --- a/cogl/cogl/cogl-poll-private.h +++ b/cogl/cogl/cogl-poll-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_POLL_PRIVATE_H__ -#define __COGL_POLL_PRIVATE_H__ +#pragma once #include "cogl-poll.h" #include "cogl-renderer.h" @@ -73,5 +72,3 @@ _cogl_poll_renderer_add_idle (CoglRenderer *renderer, CoglIdleCallback idle_cb, void *user_data, CoglUserDataDestroyCallback destroy_cb); - -#endif /* __COGL_POLL_PRIVATE_H__ */ diff --git a/cogl/cogl/cogl-poll.h b/cogl/cogl/cogl-poll.h index 8e7696e13..609dc14c4 100644 --- a/cogl/cogl/cogl-poll.h +++ b/cogl/cogl/cogl-poll.h @@ -30,13 +30,12 @@ * Neil Roberts */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_POLL_H__ -#define __COGL_POLL_H__ - #include #include @@ -179,5 +178,3 @@ cogl_poll_renderer_dispatch (CoglRenderer *renderer, int n_poll_fds); G_END_DECLS - -#endif /* __COGL_POLL_H__ */ diff --git a/cogl/cogl/cogl-primitive-private.h b/cogl/cogl/cogl-primitive-private.h index 072812148..458770e7a 100644 --- a/cogl/cogl/cogl-primitive-private.h +++ b/cogl/cogl/cogl-primitive-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_PRIMITIVE_PRIVATE_H -#define __COGL_PRIMITIVE_PRIVATE_H +#pragma once #include "cogl-object-private.h" #include "cogl-attribute-buffer-private.h" @@ -68,6 +67,3 @@ _cogl_primitive_draw (CoglPrimitive *primitive, CoglFramebuffer *framebuffer, CoglPipeline *pipeline, CoglDrawFlags flags); - -#endif /* __COGL_PRIMITIVE_PRIVATE_H */ - diff --git a/cogl/cogl/cogl-primitive-texture.h b/cogl/cogl/cogl-primitive-texture.h index 86b6be71d..046a955a4 100644 --- a/cogl/cogl/cogl-primitive-texture.h +++ b/cogl/cogl/cogl-primitive-texture.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_PRIMITIVE_TEXTURE_H__ -#define __COGL_PRIMITIVE_TEXTURE_H__ - #include "cogl-types.h" G_BEGIN_DECLS @@ -102,5 +101,3 @@ cogl_primitive_texture_set_auto_mipmap (CoglPrimitiveTexture *primitive_texture, gboolean value); G_END_DECLS - -#endif /* __COGL_PRIMITIVE_TEXTURE_H__ */ diff --git a/cogl/cogl/cogl-primitive.h b/cogl/cogl/cogl-primitive.h index 0f743bbf9..e3b3a1fad 100644 --- a/cogl/cogl/cogl-primitive.h +++ b/cogl/cogl/cogl-primitive.h @@ -31,13 +31,12 @@ * Robert Bragg */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_PRIMITIVE_H__ -#define __COGL_PRIMITIVE_H__ - /* We forward declare the CoglPrimitive type here to avoid some circular * dependency issues with the following headers. */ @@ -849,6 +848,3 @@ cogl_primitive_draw (CoglPrimitive *primitive, G_END_DECLS - -#endif /* __COGL_PRIMITIVE_H__ */ - diff --git a/cogl/cogl/cogl-primitives-private.h b/cogl/cogl/cogl-primitives-private.h index 637c33eba..ef932dff4 100644 --- a/cogl/cogl/cogl-primitives-private.h +++ b/cogl/cogl/cogl-primitives-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_PRIMITIVES_PRIVATE_H -#define __COGL_PRIMITIVES_PRIVATE_H +#pragma once #include @@ -69,5 +68,3 @@ _cogl_framebuffer_draw_multitextured_rectangles ( int n_rects); G_END_DECLS - -#endif /* __COGL_PRIMITIVES_PRIVATE_H */ diff --git a/cogl/cogl/cogl-private.h b/cogl/cogl/cogl-private.h index 16d01a651..13ecae4d5 100644 --- a/cogl/cogl/cogl-private.h +++ b/cogl/cogl/cogl-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_PRIVATE_H__ -#define __COGL_PRIVATE_H__ +#pragma once #include @@ -99,5 +98,3 @@ _cogl_init (void); COGL_FLAGS_GET ((ctx)->private_features, (feature)) G_END_DECLS - -#endif /* __COGL_PRIVATE_H__ */ diff --git a/cogl/cogl/cogl-profile.h b/cogl/cogl/cogl-profile.h index ad32a3f16..2437c175b 100644 --- a/cogl/cogl/cogl-profile.h +++ b/cogl/cogl/cogl-profile.h @@ -28,9 +28,7 @@ * */ -#ifndef __COGL_PROFILE_H__ -#define __COGL_PROFILE_H__ - +#pragma once #ifdef COGL_ENABLE_PROFILE @@ -63,6 +61,3 @@ _cogl_profile_trace_message (const char *format, ...); #define _cogl_profile_trace_message g_message #endif - -#endif /* __COGL_PROFILE_H__ */ - diff --git a/cogl/cogl/cogl-rectangle-map.h b/cogl/cogl/cogl-rectangle-map.h index 613965d68..69ef81edd 100644 --- a/cogl/cogl/cogl-rectangle-map.h +++ b/cogl/cogl/cogl-rectangle-map.h @@ -26,8 +26,7 @@ * SOFTWARE. */ -#ifndef __COGL_RECTANGLE_MAP_H -#define __COGL_RECTANGLE_MAP_H +#pragma once #include #include "cogl-types.h" @@ -80,5 +79,3 @@ _cogl_rectangle_map_foreach (CoglRectangleMap *map, void _cogl_rectangle_map_free (CoglRectangleMap *map); - -#endif /* __COGL_RECTANGLE_MAP_H */ diff --git a/cogl/cogl/cogl-renderer-private.h b/cogl/cogl/cogl-renderer-private.h index b37a5aa7c..a47da8b57 100644 --- a/cogl/cogl/cogl-renderer-private.h +++ b/cogl/cogl/cogl-renderer-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_RENDERER_PRIVATE_H -#define __COGL_RENDERER_PRIVATE_H +#pragma once #include @@ -100,5 +99,3 @@ void * _cogl_renderer_get_proc_address (CoglRenderer *renderer, const char *name, gboolean in_core); - -#endif /* __COGL_RENDERER_PRIVATE_H */ diff --git a/cogl/cogl/cogl-renderer.h b/cogl/cogl/cogl-renderer.h index 8aacfd0f3..ad8038da6 100644 --- a/cogl/cogl/cogl-renderer.h +++ b/cogl/cogl/cogl-renderer.h @@ -26,13 +26,12 @@ * SOFTWARE. */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_RENDERER_H__ -#define __COGL_RENDERER_H__ - #include #include #include @@ -401,6 +400,3 @@ COGL_EXPORT void cogl_renderer_bind_api (CoglRenderer *renderer); G_END_DECLS - -#endif /* __COGL_RENDERER_H__ */ - diff --git a/cogl/cogl/cogl-sampler-cache-private.h b/cogl/cogl/cogl-sampler-cache-private.h index bfddc12a3..24592633f 100644 --- a/cogl/cogl/cogl-sampler-cache-private.h +++ b/cogl/cogl/cogl-sampler-cache-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_SAMPLER_CACHE_PRIVATE_H -#define __COGL_SAMPLER_CACHE_PRIVATE_H +#pragma once #include "cogl-context.h" #include "cogl-gl-header.h" @@ -90,5 +89,3 @@ _cogl_sampler_cache_update_filters (CoglSamplerCache *cache, void _cogl_sampler_cache_free (CoglSamplerCache *cache); - -#endif /* __COGL_SAMPLER_CACHE_PRIVATE_H */ diff --git a/cogl/cogl/cogl-scanout.h b/cogl/cogl/cogl-scanout.h index 22e6266aa..f6c2c7c48 100644 --- a/cogl/cogl/cogl-scanout.h +++ b/cogl/cogl/cogl-scanout.h @@ -25,8 +25,7 @@ * */ -#ifndef COGL_SCANOUT_H -#define COGL_SCANOUT_H +#pragma once #include "cogl/cogl-types.h" #include "cogl/cogl-framebuffer.h" @@ -60,5 +59,3 @@ gboolean cogl_scanout_blit_to_framebuffer (CoglScanout *scanout, COGL_EXPORT void cogl_scanout_notify_failed (CoglScanout *scanout, CoglOnscreen *onscreen); - -#endif /* COGL_SCANOUT_H */ diff --git a/cogl/cogl/cogl-snippet-private.h b/cogl/cogl/cogl-snippet-private.h index 323117b77..c603b149f 100644 --- a/cogl/cogl/cogl-snippet-private.h +++ b/cogl/cogl/cogl-snippet-private.h @@ -31,8 +31,7 @@ * Neil Roberts */ -#ifndef __COGL_SNIPPET_PRIVATE_H -#define __COGL_SNIPPET_PRIVATE_H +#pragma once #include @@ -72,6 +71,3 @@ struct _CoglSnippet void _cogl_snippet_make_immutable (CoglSnippet *snippet); - -#endif /* __COGL_SNIPPET_PRIVATE_H */ - diff --git a/cogl/cogl/cogl-snippet.h b/cogl/cogl/cogl-snippet.h index 88a211445..5bb512d09 100644 --- a/cogl/cogl/cogl-snippet.h +++ b/cogl/cogl/cogl-snippet.h @@ -31,13 +31,12 @@ * Neil Roberts */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_SNIPPET_H__ -#define __COGL_SNIPPET_H__ - G_BEGIN_DECLS /** @@ -826,5 +825,3 @@ COGL_EXPORT const char * cogl_snippet_get_post (CoglSnippet *snippet); G_END_DECLS - -#endif /* __COGL_SNIPPET_H__ */ diff --git a/cogl/cogl/cogl-spans.h b/cogl/cogl/cogl-spans.h index d93c39688..d8c84b120 100644 --- a/cogl/cogl/cogl-spans.h +++ b/cogl/cogl/cogl-spans.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_SPANS_PRIVATE_H -#define __COGL_SPANS_PRIVATE_H +#pragma once #include "cogl-object-private.h" #include "cogl-pipeline-layer-state.h" @@ -77,5 +76,3 @@ _cogl_span_iter_next (CoglSpanIter *iter); gboolean _cogl_span_iter_end (CoglSpanIter *iter); - -#endif /* __COGL_SPANS_PRIVATE_H */ diff --git a/cogl/cogl/cogl-sub-texture-private.h b/cogl/cogl/cogl-sub-texture-private.h index 75c476d6e..713ff3aaa 100644 --- a/cogl/cogl/cogl-sub-texture-private.h +++ b/cogl/cogl/cogl-sub-texture-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_SUB_TEXTURE_PRIVATE_H -#define __COGL_SUB_TEXTURE_PRIVATE_H +#pragma once #include "cogl-texture-private.h" @@ -58,5 +57,3 @@ struct _CoglSubTexture int sub_x; int sub_y; }; - -#endif /* __COGL_SUB_TEXTURE_PRIVATE_H */ diff --git a/cogl/cogl/cogl-sub-texture.h b/cogl/cogl/cogl-sub-texture.h index 0b863eb12..673e41cb1 100644 --- a/cogl/cogl/cogl-sub-texture.h +++ b/cogl/cogl/cogl-sub-texture.h @@ -29,13 +29,12 @@ * Neil Roberts */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_SUB_TEXTURE_H -#define __COGL_SUB_TEXTURE_H - G_BEGIN_DECLS /** @@ -122,5 +121,3 @@ COGL_EXPORT gboolean cogl_is_sub_texture (void *object); G_END_DECLS - -#endif /* __COGL_SUB_TEXTURE_H */ diff --git a/cogl/cogl/cogl-swap-chain-private.h b/cogl/cogl/cogl-swap-chain-private.h index 3e14c2932..cd8d78d2a 100644 --- a/cogl/cogl/cogl-swap-chain-private.h +++ b/cogl/cogl/cogl-swap-chain-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_SWAP_CHAIN_PRIVATE_H -#define __COGL_SWAP_CHAIN_PRIVATE_H +#pragma once #include "cogl-object-private.h" @@ -39,5 +38,3 @@ struct _CoglSwapChain int length; }; - -#endif /* __COGL_SWAP_CHAIN_PRIVATE_H */ diff --git a/cogl/cogl/cogl-swap-chain.h b/cogl/cogl/cogl-swap-chain.h index 6e965ee9a..afdc0d8dd 100644 --- a/cogl/cogl/cogl-swap-chain.h +++ b/cogl/cogl/cogl-swap-chain.h @@ -26,13 +26,12 @@ * SOFTWARE. */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_SWAP_CHAIN_H__ -#define __COGL_SWAP_CHAIN_H__ - #include #include @@ -64,5 +63,3 @@ COGL_EXPORT gboolean cogl_is_swap_chain (void *object); G_END_DECLS - -#endif /* __COGL_SWAP_CHAIN_H__ */ diff --git a/cogl/cogl/cogl-texture-2d-private.h b/cogl/cogl/cogl-texture-2d-private.h index 4f41dadf5..79abedd60 100644 --- a/cogl/cogl/cogl-texture-2d-private.h +++ b/cogl/cogl/cogl-texture-2d-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_TEXTURE_2D_PRIVATE_H -#define __COGL_TEXTURE_2D_PRIVATE_H +#pragma once #include "cogl-object-private.h" #include "cogl-pipeline-private.h" @@ -119,5 +118,3 @@ _cogl_texture_2d_copy_from_framebuffer (CoglTexture2D *texture, int dst_x, int dst_y, int level); - -#endif /* __COGL_TEXTURE_2D_PRIVATE_H */ diff --git a/cogl/cogl/cogl-texture-2d-sliced-private.h b/cogl/cogl/cogl-texture-2d-sliced-private.h index 5ca4cbf32..5428d30c1 100644 --- a/cogl/cogl/cogl-texture-2d-sliced-private.h +++ b/cogl/cogl/cogl-texture-2d-sliced-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_TEXTURE_2D_SLICED_PRIVATE_H -#define __COGL_TEXTURE_2D_SLICED_PRIVATE_H +#pragma once #include "cogl-bitmap-private.h" #include "cogl-pipeline-private.h" @@ -53,5 +52,3 @@ CoglTexture2DSliced * _cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp, int max_waste, gboolean can_convert_in_place); - -#endif /* __COGL_TEXTURE_2D_SLICED_PRIVATE_H */ diff --git a/cogl/cogl/cogl-texture-2d-sliced.h b/cogl/cogl/cogl-texture-2d-sliced.h index 4591f63e4..696fec8b0 100644 --- a/cogl/cogl/cogl-texture-2d-sliced.h +++ b/cogl/cogl/cogl-texture-2d-sliced.h @@ -30,8 +30,7 @@ * Robert Bragg */ -#ifndef __COGL_TEXURE_2D_SLICED_H -#define __COGL_TEXURE_2D_SLICED_H +#pragma once #include "cogl-context.h" #include "cogl-types.h" @@ -285,5 +284,3 @@ cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp, */ COGL_EXPORT gboolean cogl_is_texture_2d_sliced (void *object); - -#endif /* __COGL_TEXURE_2D_SLICED_H */ diff --git a/cogl/cogl/cogl-texture-2d.h b/cogl/cogl/cogl-texture-2d.h index 3726f3dc3..31beaff08 100644 --- a/cogl/cogl/cogl-texture-2d.h +++ b/cogl/cogl/cogl-texture-2d.h @@ -30,13 +30,12 @@ * Robert Bragg */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_TEXTURE_2D_H -#define __COGL_TEXTURE_2D_H - #include "cogl-context.h" #include "cogl-bitmap.h" @@ -277,5 +276,3 @@ cogl_texture_2d_egl_image_external_alloc_finish (CoglTexture2D *tex_2d, #endif G_END_DECLS - -#endif /* __COGL_TEXTURE_2D_H */ diff --git a/cogl/cogl/cogl-texture-driver.h b/cogl/cogl/cogl-texture-driver.h index 8fa0d86a1..1759a8bad 100644 --- a/cogl/cogl/cogl-texture-driver.h +++ b/cogl/cogl/cogl-texture-driver.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_TEXTURE_DRIVER_H -#define __COGL_TEXTURE_DRIVER_H +#pragma once typedef struct _CoglTextureDriver CoglTextureDriver; @@ -145,6 +144,3 @@ struct _CoglTextureDriver GLenum *closest_gl_format, GLenum *closest_gl_type); }; - -#endif /* __COGL_TEXTURE_DRIVER_H */ - diff --git a/cogl/cogl/cogl-texture-private.h b/cogl/cogl/cogl-texture-private.h index dba7764cd..d3466c6d5 100644 --- a/cogl/cogl/cogl-texture-private.h +++ b/cogl/cogl/cogl-texture-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_TEXTURE_PRIVATE_H -#define __COGL_TEXTURE_PRIVATE_H +#pragma once #include "cogl-bitmap-private.h" #include "cogl-object-private.h" @@ -405,5 +404,3 @@ _cogl_texture_create_loader (void); void _cogl_texture_copy_internal_format (CoglTexture *src, CoglTexture *dest); - -#endif /* __COGL_TEXTURE_PRIVATE_H */ diff --git a/cogl/cogl/cogl-texture.h b/cogl/cogl/cogl-texture.h index a2c23132b..003f3fbac 100644 --- a/cogl/cogl/cogl-texture.h +++ b/cogl/cogl/cogl-texture.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_TEXTURE_H__ -#define __COGL_TEXTURE_H__ - /* We forward declare the CoglTexture type here to avoid some circular * dependency issues with the following headers. */ @@ -486,5 +485,3 @@ COGL_EXPORT gboolean cogl_texture_is_get_data_supported (CoglTexture *texture); G_END_DECLS - -#endif /* __COGL_TEXTURE_H__ */ diff --git a/cogl/cogl/cogl-trace.h b/cogl/cogl/cogl-trace.h index 10342a064..5b9ce9dcc 100644 --- a/cogl/cogl/cogl-trace.h +++ b/cogl/cogl/cogl-trace.h @@ -25,8 +25,7 @@ * */ -#ifndef COGL_TRACE_H -#define COGL_TRACE_H +#pragma once #include #include @@ -171,5 +170,3 @@ COGL_EXPORT void cogl_set_tracing_disabled_on_thread (void *data); #endif /* COGL_HAS_TRACING */ - -#endif /* COGL_TRACE_H */ diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h index a7452ade6..c87ac9cc1 100644 --- a/cogl/cogl/cogl-types.h +++ b/cogl/cogl/cogl-types.h @@ -28,12 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_TYPES_H__ -#define __COGL_TYPES_H__ #include #include @@ -469,5 +469,3 @@ typedef enum } CoglStereoMode; G_END_DECLS - -#endif /* __COGL_TYPES_H__ */ diff --git a/cogl/cogl/cogl-util.h b/cogl/cogl/cogl-util.h index 8ebf01bb9..1253af3ef 100644 --- a/cogl/cogl/cogl-util.h +++ b/cogl/cogl/cogl-util.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_UTIL_H -#define __COGL_UTIL_H +#pragma once #include #include @@ -166,5 +165,3 @@ _cogl_util_scissor_intersect (int rect_x0, *scissor_x1 = MIN (*scissor_x1, rect_x1); *scissor_y1 = MIN (*scissor_y1, rect_y1); } - -#endif /* __COGL_UTIL_H */ diff --git a/cogl/cogl/cogl-x11-onscreen.h b/cogl/cogl/cogl-x11-onscreen.h index 80bec7893..906fa6d7b 100644 --- a/cogl/cogl/cogl-x11-onscreen.h +++ b/cogl/cogl/cogl-x11-onscreen.h @@ -18,13 +18,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef COGL_X11_ONSCREEN_H -#define COGL_X11_ONSCREEN_H - #include #include @@ -45,5 +44,3 @@ struct _CoglX11OnscreenInterface COGL_EXPORT Window cogl_x11_onscreen_get_x11_window (CoglX11Onscreen *x11_onscreen); - -#endif /* COGL_X11_ONSCREEN_H */ diff --git a/cogl/cogl/cogl-x11-renderer-private.h b/cogl/cogl/cogl-x11-renderer-private.h index 17655da2b..5a0559580 100644 --- a/cogl/cogl/cogl-x11-renderer-private.h +++ b/cogl/cogl/cogl-x11-renderer-private.h @@ -28,13 +28,10 @@ * */ -#ifndef __COGL_RENDERER_X11_PRIVATE_H -#define __COGL_RENDERER_X11_PRIVATE_H +#pragma once typedef struct _CoglX11Renderer { int damage_base; int randr_base; } CoglX11Renderer; - -#endif /* __COGL_RENDERER_X11_PRIVATE_H */ diff --git a/cogl/cogl/cogl-xlib-private.h b/cogl/cogl/cogl-xlib-private.h index 317163fb2..5dffdbed1 100644 --- a/cogl/cogl/cogl-xlib-private.h +++ b/cogl/cogl/cogl-xlib-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_XLIB_PRIVATE_H -#define __COGL_XLIB_PRIVATE_H +#pragma once #include @@ -44,5 +43,3 @@ struct _CoglXlibTrapState int trapped_error_code; CoglXlibTrapState *old_state; }; - -#endif /* __COGL_XLIB_PRIVATE_H */ diff --git a/cogl/cogl/cogl-xlib-renderer-private.h b/cogl/cogl/cogl-xlib-renderer-private.h index edfa189b7..187ace8cf 100644 --- a/cogl/cogl/cogl-xlib-renderer-private.h +++ b/cogl/cogl/cogl-xlib-renderer-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_RENDERER_XLIB_PRIVATE_H -#define __COGL_RENDERER_XLIB_PRIVATE_H +#pragma once #include @@ -98,5 +97,3 @@ _cogl_xlib_renderer_output_for_rectangle (CoglRenderer *renderer, int y, int width, int height); - -#endif /* __COGL_RENDERER_XLIB_PRIVATE_H */ diff --git a/cogl/cogl/cogl-xlib-renderer.h b/cogl/cogl/cogl-xlib-renderer.h index 3afdabb27..6c643e519 100644 --- a/cogl/cogl/cogl-xlib-renderer.h +++ b/cogl/cogl/cogl-xlib-renderer.h @@ -26,13 +26,12 @@ * SOFTWARE. */ +#pragma once + #if !defined(__COGL_XLIB_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_XLIB_RENDERER_H__ -#define __COGL_XLIB_RENDERER_H__ - #include #include @@ -206,5 +205,3 @@ G_END_DECLS #undef __COGL_H_INSIDE__ #undef __COGL_XLIB_RENDERER_H_MUST_UNDEF_COGL_H_INSIDE_COGL_XLIB_RENDERER_ #endif - -#endif /* __COGL_XLIB_RENDERER_H__ */ diff --git a/cogl/cogl/cogl-xlib.h b/cogl/cogl/cogl-xlib.h index 4fd803b88..45b250c07 100644 --- a/cogl/cogl/cogl-xlib.h +++ b/cogl/cogl/cogl-xlib.h @@ -26,8 +26,7 @@ * SOFTWARE. */ -#ifndef __COGL_XLIB_H__ -#define __COGL_XLIB_H__ +#pragma once #include @@ -71,5 +70,3 @@ #undef __COGL_XLIB_H_INSIDE__ #undef __COGL_XLIB_H_MUST_UNDEF_COGL_H_INSIDE__ #endif - -#endif /* __COGL_XLIB_H__ */ diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h index dfb6c7483..2d9e7563d 100644 --- a/cogl/cogl/cogl.h +++ b/cogl/cogl/cogl.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_H__ -#define __COGL_H__ +#pragma once #ifdef COGL_COMPILATION #error " shouldn't be included internally" @@ -143,5 +142,3 @@ #undef __COGL_H_INSIDE__ #undef __COGL_MUST_UNDEF_COGL_H_INSIDE__ #endif - -#endif /* __COGL_H__ */ diff --git a/cogl/cogl/cogl1-context.h b/cogl/cogl/cogl1-context.h index d7860a8d0..e7bdcdf2c 100644 --- a/cogl/cogl/cogl1-context.h +++ b/cogl/cogl/cogl1-context.h @@ -30,13 +30,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_1_CONTEXT_H__ -#define __COGL_1_CONTEXT_H__ - #include #include #include @@ -91,5 +90,3 @@ COGL_EXPORT void cogl_flush (void); G_END_DECLS - -#endif /* __COGL_1_CONTEXT_H__ */ diff --git a/cogl/cogl/deprecated/cogl-clutter.h b/cogl/cogl/deprecated/cogl-clutter.h index 3cf624d20..0dbf74a37 100644 --- a/cogl/cogl/deprecated/cogl-clutter.h +++ b/cogl/cogl/deprecated/cogl-clutter.h @@ -26,13 +26,12 @@ * SOFTWARE. */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_CLUTTER_H__ -#define __COGL_CLUTTER_H__ - G_BEGIN_DECLS #define cogl_clutter_winsys_has_feature cogl_clutter_winsys_has_feature_CLUTTER @@ -41,5 +40,3 @@ COGL_EXPORT gboolean cogl_clutter_winsys_has_feature (CoglWinsysFeature feature); G_END_DECLS - -#endif /* __COGL_CLUTTER_H__ */ diff --git a/cogl/cogl/deprecated/cogl-program-private.h b/cogl/cogl/deprecated/cogl-program-private.h index 86ebdfd04..eaa3a5e44 100644 --- a/cogl/cogl/deprecated/cogl-program-private.h +++ b/cogl/cogl/deprecated/cogl-program-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_PROGRAM_H -#define __COGL_PROGRAM_H +#pragma once #include "cogl-object-private.h" #include "cogl-shader-private.h" @@ -81,5 +80,3 @@ _cogl_program_has_fragment_shader (CoglHandle handle); gboolean _cogl_program_has_vertex_shader (CoglHandle handle); - -#endif /* __COGL_PROGRAM_H */ diff --git a/cogl/cogl/deprecated/cogl-shader-private.h b/cogl/cogl/deprecated/cogl-shader-private.h index 329a4ffac..a9552dac4 100644 --- a/cogl/cogl/deprecated/cogl-shader-private.h +++ b/cogl/cogl/deprecated/cogl-shader-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_SHADER_H -#define __COGL_SHADER_H +#pragma once #include "cogl-object-private.h" #include "cogl-shader.h" @@ -46,5 +45,3 @@ struct _CoglShader CoglShaderType type; char *source; }; - -#endif /* __COGL_SHADER_H */ diff --git a/cogl/cogl/deprecated/cogl-shader.h b/cogl/cogl/deprecated/cogl-shader.h index 662356bdc..88d5e730c 100644 --- a/cogl/cogl/deprecated/cogl-shader.h +++ b/cogl/cogl/deprecated/cogl-shader.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_SHADER_H__ -#define __COGL_SHADER_H__ - #include #include #include @@ -475,5 +474,3 @@ cogl_program_set_uniform_matrix (CoglHandle program, const float *value); G_END_DECLS - -#endif /* __COGL_SHADER_H__ */ diff --git a/cogl/cogl/deprecated/cogl-type-casts.h b/cogl/cogl/deprecated/cogl-type-casts.h index 4ea811011..db917d623 100644 --- a/cogl/cogl/deprecated/cogl-type-casts.h +++ b/cogl/cogl/deprecated/cogl-type-casts.h @@ -28,13 +28,12 @@ * */ +#pragma once + #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif -#ifndef __COGL_TYPE_CASTS_H__ -#define __COGL_TYPE_CASTS_H__ - /* The various interface types in Cogl used to be more strongly typed * which required lots type casting by developers. We provided * macros for performing these casts following a widely used Gnome @@ -50,5 +49,3 @@ #define COGL_META_TEXTURE(X) (X) #define COGL_PRIMITIVE_TEXTURE(X) (X) #endif - -#endif /* __COGL_TYPE_CASTS_H__ */ diff --git a/cogl/cogl/driver/gl/cogl-attribute-gl-private.h b/cogl/cogl/driver/gl/cogl-attribute-gl-private.h index 8370621e3..b12e21b99 100644 --- a/cogl/cogl/driver/gl/cogl-attribute-gl-private.h +++ b/cogl/cogl/driver/gl/cogl-attribute-gl-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef _COGL_ATTRIBUTE_GL_PRIVATE_H_ -#define _COGL_ATTRIBUTE_GL_PRIVATE_H_ +#pragma once #include "cogl-types.h" #include "cogl-framebuffer.h" @@ -46,5 +45,3 @@ _cogl_gl_flush_attributes_state (CoglFramebuffer *framebuffer, CoglDrawFlags flags, CoglAttribute **attributes, int n_attributes); - -#endif /* _COGL_ATTRIBUTE_GL_PRIVATE_H_ */ diff --git a/cogl/cogl/driver/gl/cogl-bitmap-gl-private.h b/cogl/cogl/driver/gl/cogl-bitmap-gl-private.h index b2726c421..90541d062 100644 --- a/cogl/cogl/driver/gl/cogl-bitmap-gl-private.h +++ b/cogl/cogl/driver/gl/cogl-bitmap-gl-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_BITMAP_GL_PRIVATE_H -#define __COGL_BITMAP_GL_PRIVATE_H +#pragma once #include "cogl-bitmap-private.h" @@ -48,5 +47,3 @@ _cogl_bitmap_gl_bind (CoglBitmap *bitmap, void _cogl_bitmap_gl_unbind (CoglBitmap *bitmap); - -#endif /* __COGL_BITMAP_GL_PRIVATE_H */ diff --git a/cogl/cogl/driver/gl/cogl-buffer-gl-private.h b/cogl/cogl/driver/gl/cogl-buffer-gl-private.h index 61807f17e..e8fd48480 100644 --- a/cogl/cogl/driver/gl/cogl-buffer-gl-private.h +++ b/cogl/cogl/driver/gl/cogl-buffer-gl-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef _COGL_BUFFER_GL_PRIVATE_H_ -#define _COGL_BUFFER_GL_PRIVATE_H_ +#pragma once #include "cogl-types.h" #include "cogl-context.h" @@ -70,5 +69,3 @@ _cogl_buffer_gl_bind (CoglBuffer *buffer, void _cogl_buffer_gl_unbind (CoglBuffer *buffer); - -#endif /* _COGL_BUFFER_GL_PRIVATE_H_ */ diff --git a/cogl/cogl/driver/gl/cogl-clip-stack-gl-private.h b/cogl/cogl/driver/gl/cogl-clip-stack-gl-private.h index ff22d2660..9cfee7958 100644 --- a/cogl/cogl/driver/gl/cogl-clip-stack-gl-private.h +++ b/cogl/cogl/driver/gl/cogl-clip-stack-gl-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef _COGL_CLIP_STACK_GL_PRIVATE_H_ -#define _COGL_CLIP_STACK_GL_PRIVATE_H_ +#pragma once #include "cogl-types.h" #include "cogl-framebuffer.h" @@ -41,5 +40,3 @@ void _cogl_clip_stack_gl_flush (CoglClipStack *stack, CoglFramebuffer *framebuffer); - -#endif /* _COGL_CLIP_STACK_GL_PRIVATE_H_ */ diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h b/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h index 3f3f6b7c8..fd6e9df21 100644 --- a/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h +++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_FRAMEBUFFER_GL_PRIVATE_H__ -#define __COGL_FRAMEBUFFER_GL_PRIVATE_H__ +#pragma once #include "cogl-attribute-private.h" #include "cogl-framebuffer-driver.h" @@ -60,7 +59,3 @@ cogl_gl_framebuffer_bind (CoglGlFramebuffer *gl_framebuffer, void cogl_gl_framebuffer_flush_state_differences (CoglGlFramebuffer *gl_framebuffer, unsigned long differences); - -#endif /* __COGL_FRAMEBUFFER_GL_PRIVATE_H__ */ - - diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.h b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.h index 417f8a738..714154c9f 100644 --- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.h +++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.h @@ -23,8 +23,7 @@ * */ -#ifndef COGL_GL_FRAMEBUFFER_BACK_H -#define COGL_GL_FRAMEBUFFER_BACK_H +#pragma once #include "cogl-framebuffer-gl-private.h" @@ -37,5 +36,3 @@ CoglGlFramebufferBack * cogl_gl_framebuffer_back_new (CoglFramebuffer *framebuffer, const CoglFramebufferDriverConfig *driver_config, GError **error); - -#endif /* COGL_GL_FRAMEBUFFER_BACK_H */ diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.h b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.h index 896847cf8..b06689a3c 100644 --- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.h +++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.h @@ -23,8 +23,7 @@ * */ -#ifndef COGL_GL_FRAMEBUFFER_FBO_H -#define COGL_GL_FRAMEBUFFER_FBO_H +#pragma once #include "driver/gl/cogl-framebuffer-gl-private.h" @@ -37,5 +36,3 @@ CoglGlFramebufferFbo * cogl_gl_framebuffer_fbo_new (CoglFramebuffer *framebuffer, const CoglFramebufferDriverConfig *driver_config, GError **error); - -#endif /* COGL_GL_FRAMEBUFFER_FBO_H */ diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h index 72f5928a8..8733e2a79 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h +++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_PIPELINE_FRAGEND_GLSL_PRIVATE_H -#define __COGL_PIPELINE_FRAGEND_GLSL_PRIVATE_H +#pragma once #include "cogl-pipeline-private.h" @@ -40,6 +39,3 @@ extern const CoglPipelineFragend _cogl_pipeline_glsl_fragend; GLuint _cogl_pipeline_fragend_glsl_get_shader (CoglPipeline *pipeline); - -#endif /* __COGL_PIPELINE_FRAGEND_GLSL_PRIVATE_H */ - diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h index 3626fd16c..72da810eb 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h +++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_PIPELINE_OPENGL_PRIVATE_H -#define __COGL_PIPELINE_OPENGL_PRIVATE_H +#pragma once #include "cogl-pipeline-private.h" #include "cogl-matrix-stack.h" @@ -167,6 +166,3 @@ void _cogl_gl_set_uniform (CoglContext *ctx, GLint location, const CoglBoxedValue *value); - -#endif /* __COGL_PIPELINE_OPENGL_PRIVATE_H */ - diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl-private.h index d57519b80..eeea83fd0 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl-private.h +++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl-private.h @@ -31,8 +31,7 @@ * Neil Roberts */ -#ifndef __COGL_PIPELINE_PROGEND_GLSL_PRIVATE_H -#define __COGL_PIPELINE_PROGEND_GLSL_PRIVATE_H +#pragma once #include "cogl-pipeline-private.h" #include "cogl-attribute-private.h" @@ -42,6 +41,3 @@ extern const CoglPipelineProgend _cogl_pipeline_glsl_progend; int _cogl_pipeline_progend_glsl_get_attrib_location (CoglPipeline *pipeline, int name_index); - -#endif /* __COGL_PIPELINE_PROGEND_GLSL_PRIVATE_H */ - diff --git a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h index 8260311ca..5e4912f39 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h +++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef __COGL_PIPELINE_VERTEND_GLSL_PRIVATE_H -#define __COGL_PIPELINE_VERTEND_GLSL_PRIVATE_H +#pragma once #include "cogl-pipeline-private.h" @@ -45,6 +44,3 @@ _cogl_pipeline_vertend_glsl_get_shader (CoglPipeline *pipeline); COGL_EXPORT_TEST CoglPipelineVertendShaderState * cogl_pipeline_vertend_glsl_get_shader_state (CoglPipeline *pipeline); - -#endif /* __COGL_PIPELINE_VERTEND_GLSL_PRIVATE_H */ - diff --git a/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h b/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h index 574c10fb0..9d08ebdf1 100644 --- a/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h +++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef _COGL_TEXTURE_2D_GL_PRIVATE_H_ -#define _COGL_TEXTURE_2D_GL_PRIVATE_H_ +#pragma once #include "cogl-types.h" #include "cogl-context-private.h" @@ -124,5 +123,3 @@ _cogl_texture_2d_gl_get_data (CoglTexture2D *tex_2d, CoglPixelFormat format, int rowstride, uint8_t *data); - -#endif /* _COGL_TEXTURE_2D_GL_PRIVATE_H_ */ diff --git a/cogl/cogl/driver/gl/cogl-texture-gl-private.h b/cogl/cogl/driver/gl/cogl-texture-gl-private.h index 7804f8e7e..c69e4ccaf 100644 --- a/cogl/cogl/driver/gl/cogl-texture-gl-private.h +++ b/cogl/cogl/driver/gl/cogl-texture-gl-private.h @@ -27,8 +27,7 @@ * */ -#ifndef _COGL_TEXTURE_GL_PRIVATE_H_ -#define _COGL_TEXTURE_GL_PRIVATE_H_ +#pragma once #include "cogl-context.h" @@ -68,5 +67,3 @@ _cogl_texture_min_filter_get_lod_bias (GLenum min_filter) return (min_filter == GL_NEAREST_MIPMAP_NEAREST || min_filter == GL_LINEAR_MIPMAP_NEAREST) ? -0.5f : 0.0f; } - -#endif /* _COGL_TEXTURE_GL_PRIVATE_H_ */ diff --git a/cogl/cogl/driver/gl/cogl-util-gl-private.h b/cogl/cogl/driver/gl/cogl-util-gl-private.h index 2929e1c2d..05bb64c61 100644 --- a/cogl/cogl/driver/gl/cogl-util-gl-private.h +++ b/cogl/cogl/driver/gl/cogl-util-gl-private.h @@ -30,7 +30,7 @@ * Robert Bragg */ -#ifndef _COGL_UTIL_GL_PRIVATE_H_ +#pragma once #include "cogl-types.h" #include "cogl-context.h" @@ -253,5 +253,3 @@ cogl_gl_get_gpu_time_ns (CoglContext *context); #ifndef GL_TEXTURE_LOD_BIAS #define GL_TEXTURE_LOD_BIAS 0x8501 #endif - -#endif /* _COGL_UTIL_GL_PRIVATE_H_ */ diff --git a/cogl/cogl/driver/nop/cogl-attribute-nop-private.h b/cogl/cogl/driver/nop/cogl-attribute-nop-private.h index 9c8547dad..0b1f84b36 100644 --- a/cogl/cogl/driver/nop/cogl-attribute-nop-private.h +++ b/cogl/cogl/driver/nop/cogl-attribute-nop-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef _COGL_ATTRIBUTE_NOP_PRIVATE_H_ -#define _COGL_ATTRIBUTE_NOP_PRIVATE_H_ +#pragma once #include "cogl-types.h" #include "cogl-context-private.h" @@ -44,5 +43,3 @@ _cogl_nop_flush_attributes_state (CoglFramebuffer *framebuffer, CoglDrawFlags flags, CoglAttribute **attributes, int n_attributes); - -#endif /* _COGL_ATTRIBUTE_NOP_PRIVATE_H_ */ diff --git a/cogl/cogl/driver/nop/cogl-clip-stack-nop-private.h b/cogl/cogl/driver/nop/cogl-clip-stack-nop-private.h index 4d8513b06..0bb1c96af 100644 --- a/cogl/cogl/driver/nop/cogl-clip-stack-nop-private.h +++ b/cogl/cogl/driver/nop/cogl-clip-stack-nop-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef _COGL_CLIP_STACK_NOP_PRIVATE_H_ -#define _COGL_CLIP_STACK_NOP_PRIVATE_H_ +#pragma once #include "cogl-types.h" #include "cogl-context-private.h" @@ -40,5 +39,3 @@ void _cogl_clip_stack_nop_flush (CoglClipStack *stack, CoglFramebuffer *framebuffer); - -#endif /* _COGL_CLIP_STACK_NOP_PRIVATE_H_ */ diff --git a/cogl/cogl/driver/nop/cogl-nop-framebuffer.h b/cogl/cogl/driver/nop/cogl-nop-framebuffer.h index 7c9f729a6..b8d435908 100644 --- a/cogl/cogl/driver/nop/cogl-nop-framebuffer.h +++ b/cogl/cogl/driver/nop/cogl-nop-framebuffer.h @@ -23,8 +23,7 @@ * */ -#ifndef COGL_NOP_FRAMEBUFFER_H -#define COGL_NOP_FRAMEBUFFER_H +#pragma once #include "cogl-framebuffer-driver.h" @@ -32,5 +31,3 @@ G_DECLARE_FINAL_TYPE (CoglNopFramebuffer, cogl_nop_framebuffer, COGL, NOP_FRAMEBUFFER_DRIVER, CoglFramebufferDriver) - -#endif /* COGL_NOP_FRAMEBUFFER_H */ diff --git a/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h b/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h index dce8b689d..63883ffd2 100644 --- a/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h +++ b/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h @@ -31,8 +31,7 @@ * Robert Bragg */ -#ifndef _COGL_TEXTURE_2D_NOP_PRIVATE_H_ -#define _COGL_TEXTURE_2D_NOP_PRIVATE_H_ +#pragma once #include "cogl-types.h" #include "cogl-context-private.h" @@ -98,5 +97,3 @@ _cogl_texture_2d_nop_get_data (CoglTexture2D *tex_2d, CoglPixelFormat format, size_t rowstride, uint8_t *data); - -#endif /* _COGL_TEXTURE_2D_NOP_PRIVATE_H_ */ diff --git a/cogl/cogl/winsys/cogl-glx-display-private.h b/cogl/cogl/winsys/cogl-glx-display-private.h index f931b1764..63be7a312 100644 --- a/cogl/cogl/winsys/cogl-glx-display-private.h +++ b/cogl/cogl/winsys/cogl-glx-display-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_DISPLAY_GLX_PRIVATE_H -#define __COGL_DISPLAY_GLX_PRIVATE_H +#pragma once #include "cogl-object-private.h" @@ -60,5 +59,3 @@ typedef struct _CoglGLXDisplay GLXWindow dummy_glxwin; Window dummy_xwin; } CoglGLXDisplay; - -#endif /* __COGL_DISPLAY_GLX_PRIVATE_H */ diff --git a/cogl/cogl/winsys/cogl-glx-renderer-private.h b/cogl/cogl/winsys/cogl-glx-renderer-private.h index 64ccf7c90..94ec39027 100644 --- a/cogl/cogl/winsys/cogl-glx-renderer-private.h +++ b/cogl/cogl/winsys/cogl-glx-renderer-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_RENDERER_GLX_PRIVATE_H -#define __COGL_RENDERER_GLX_PRIVATE_H +#pragma once #include #include "cogl-object-private.h" @@ -101,5 +100,3 @@ typedef struct _CoglGLXRenderer #undef COGL_WINSYS_FEATURE_FUNCTION #undef COGL_WINSYS_FEATURE_END } CoglGLXRenderer; - -#endif /* __COGL_RENDERER_GLX_PRIVATE_H */ diff --git a/cogl/cogl/winsys/cogl-glx.h b/cogl/cogl/winsys/cogl-glx.h index b04656981..ba7bac7b9 100644 --- a/cogl/cogl/winsys/cogl-glx.h +++ b/cogl/cogl/winsys/cogl-glx.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_GLX_H__ -#define __COGL_GLX_H__ +#pragma once /* NB: this is a top-level header that can be included directly but we * want to be careful not to define __COGL_H_INSIDE__ when this is @@ -72,5 +71,3 @@ #undef __COGL_GLX_H_INSIDE__ #undef __COGL_MUST_UNDEF_COGL_H_INSIDE_COGL_GLX_ #endif - -#endif /* __COGL_GLX_H__ */ diff --git a/cogl/cogl/winsys/cogl-onscreen-egl.h b/cogl/cogl/winsys/cogl-onscreen-egl.h index 08e798da0..19d4da255 100644 --- a/cogl/cogl/winsys/cogl-onscreen-egl.h +++ b/cogl/cogl/winsys/cogl-onscreen-egl.h @@ -23,8 +23,7 @@ * SOFTWARE. */ -#ifndef COGL_ONSCREEN_EGL_H -#define COGL_ONSCREEN_EGL_H +#pragma once #include "cogl-onscreen.h" #include "winsys/cogl-winsys-egl-private.h" @@ -52,5 +51,3 @@ gboolean cogl_onscreen_egl_choose_config (CoglOnscreenEgl *onscreen_egl, EGLConfig *out_egl_config, GError **error); - -#endif /* COGL_ONSCREEN_EGL_H */ diff --git a/cogl/cogl/winsys/cogl-onscreen-glx.h b/cogl/cogl/winsys/cogl-onscreen-glx.h index 1051cb231..1594075ca 100644 --- a/cogl/cogl/winsys/cogl-onscreen-glx.h +++ b/cogl/cogl/winsys/cogl-onscreen-glx.h @@ -23,8 +23,7 @@ * SOFTWARE. */ -#ifndef COGL_ONSCREEN_GLX_H -#define COGL_ONSCREEN_GLX_H +#pragma once #include #include @@ -55,5 +54,3 @@ cogl_onscreen_glx_notify_swap_buffers (CoglOnscreen *onscreen, gboolean cogl_onscreen_glx_is_for_window (CoglOnscreen *onscreen, Window window); - -#endif /* COGL_ONSCREEN_GLX_H */ diff --git a/cogl/cogl/winsys/cogl-onscreen-xlib.h b/cogl/cogl/winsys/cogl-onscreen-xlib.h index 07a1ceaa0..cc82b8bb3 100644 --- a/cogl/cogl/winsys/cogl-onscreen-xlib.h +++ b/cogl/cogl/winsys/cogl-onscreen-xlib.h @@ -24,8 +24,7 @@ * */ -#ifndef COGL_ONSCREEN_XLIB_H -#define COGL_ONSCREEN_XLIB_H +#pragma once #include "cogl-onscreen.h" #include "winsys/cogl-onscreen-egl.h" @@ -57,5 +56,3 @@ void cogl_onscreen_xlib_resize (CoglOnscreen *onscreen, int width, int height); - -#endif /* COGL_ONSCREEN_XLIB_H */ diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h b/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h index c1d6d9361..894a66b2a 100644 --- a/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h +++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_TEXTURE_PIXMAP_X11_PRIVATE_H -#define __COGL_TEXTURE_PIXMAP_X11_PRIVATE_H +#pragma once #include #include @@ -98,6 +97,3 @@ struct _CoglTexturePixmapX11 texture */ gboolean use_winsys_texture; }; - - -#endif /* __COGL_TEXTURE_PIXMAP_X11_PRIVATE_H */ diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.h b/cogl/cogl/winsys/cogl-texture-pixmap-x11.h index 60e3b1317..8a1fddbdd 100644 --- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.h +++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_TEXTURE_PIXMAP_X11_H -#define __COGL_TEXTURE_PIXMAP_X11_H +#pragma once /* NB: this is a top-level header that can be included directly but we * want to be careful not to define __COGL_H_INSIDE__ when this is @@ -238,5 +237,3 @@ G_END_DECLS #undef __COGL_H_INSIDE__ #undef __COGL_MUST_UNDEF_COGL_H_INSIDE_COGL_TEXTURE_PIXMAP_X11_ #endif - -#endif /* __COGL_TEXTURE_PIXMAP_X11_H */ diff --git a/cogl/cogl/winsys/cogl-winsys-egl-private.h b/cogl/cogl/winsys/cogl-winsys-egl-private.h index 9d6fa5cfb..4ef5c0928 100644 --- a/cogl/cogl/winsys/cogl-winsys-egl-private.h +++ b/cogl/cogl/winsys/cogl-winsys-egl-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_WINSYS_EGL_PRIVATE_H -#define __COGL_WINSYS_EGL_PRIVATE_H +#pragma once #include "cogl-defines.h" #include "cogl-context.h" @@ -198,5 +197,3 @@ void cogl_display_egl_determine_attributes (CoglDisplay *display, const CoglFramebufferConfig *config, EGLint *attributes); - -#endif /* __COGL_WINSYS_EGL_PRIVATE_H */ diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11-private.h b/cogl/cogl/winsys/cogl-winsys-egl-x11-private.h index 7d4218c0d..4ca14f15a 100644 --- a/cogl/cogl/winsys/cogl-winsys-egl-x11-private.h +++ b/cogl/cogl/winsys/cogl-winsys-egl-x11-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_WINSYS_EGL_X11_PRIVATE_H -#define __COGL_WINSYS_EGL_X11_PRIVATE_H +#pragma once #include "winsys/cogl-winsys-private.h" @@ -39,5 +38,3 @@ _cogl_winsys_egl_xlib_get_vtable (void); XVisualInfo * cogl_display_xlib_get_visual_info (CoglDisplay *display, EGLConfig egl_config); - -#endif /* __COGL_WINSYS_EGL_X11_PRIVATE_H */ diff --git a/cogl/cogl/winsys/cogl-winsys-glx-private.h b/cogl/cogl/winsys/cogl-winsys-glx-private.h index 7151a8efe..a6732d984 100644 --- a/cogl/cogl/winsys/cogl-winsys-glx-private.h +++ b/cogl/cogl/winsys/cogl-winsys-glx-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_WINSYS_GLX_PRIVATE_H -#define __COGL_WINSYS_GLX_PRIVATE_H +#pragma once COGL_EXPORT const CoglWinsysVtable * _cogl_winsys_glx_get_vtable (void); @@ -46,5 +45,3 @@ cogl_context_glx_set_current_drawable (CoglContext *context, GLXDrawable cogl_context_glx_get_current_drawable (CoglContext *context); - -#endif /* __COGL_WINSYS_GLX_PRIVATE_H */ diff --git a/cogl/cogl/winsys/cogl-winsys-private.h b/cogl/cogl/winsys/cogl-winsys-private.h index 98b5793f2..df467eaaa 100644 --- a/cogl/cogl/winsys/cogl-winsys-private.h +++ b/cogl/cogl/winsys/cogl-winsys-private.h @@ -28,8 +28,7 @@ * */ -#ifndef __COGL_WINSYS_PRIVATE_H -#define __COGL_WINSYS_PRIVATE_H +#pragma once #include "cogl-renderer.h" #include "cogl-scanout.h" @@ -150,5 +149,3 @@ typedef const CoglWinsysVtable *(*CoglWinsysVtableGetter) (void); gboolean _cogl_winsys_has_feature (CoglWinsysFeature feature); - -#endif /* __COGL_WINSYS_PRIVATE_H */ diff --git a/src/backends/edid.h b/src/backends/edid.h index 98cb32948..5076f750b 100644 --- a/src/backends/edid.h +++ b/src/backends/edid.h @@ -22,8 +22,7 @@ * Author: Soren Sandmann */ -#ifndef EDID_H -#define EDID_H +#pragma once #include @@ -98,5 +97,3 @@ struct _MetaEdidInfo META_EXPORT_TEST MetaEdidInfo *meta_edid_info_new_parse (const uint8_t *edid, size_t size); - -#endif diff --git a/src/backends/gsm-inhibitor-flag.h b/src/backends/gsm-inhibitor-flag.h index 40698f96a..4abd24ab0 100644 --- a/src/backends/gsm-inhibitor-flag.h +++ b/src/backends/gsm-inhibitor-flag.h @@ -16,8 +16,7 @@ * along with this program; if not, see . */ -#ifndef __GSM_INHIBITOR_FLAG_H__ -#define __GSM_INHIBITOR_FLAG_H__ +#pragma once #include @@ -32,5 +31,3 @@ typedef enum { } GsmInhibitorFlag; G_END_DECLS - -#endif /* __GSM_INHIBITOR_FLAG_H__ */ diff --git a/src/backends/meta-backend-private.h b/src/backends/meta-backend-private.h index a935d3a2a..68b4b1796 100644 --- a/src/backends/meta-backend-private.h +++ b/src/backends/meta-backend-private.h @@ -22,9 +22,7 @@ * Jasper St. Pierre */ - -#ifndef META_BACKEND_PRIVATE_H -#define META_BACKEND_PRIVATE_H +#pragma once #include #include @@ -215,5 +213,3 @@ void meta_backend_update_from_event (MetaBackend *backend, char * meta_backend_get_vendor_name (MetaBackend *backend, const char *pnp_id); - -#endif /* META_BACKEND_PRIVATE_H */ diff --git a/src/backends/meta-backend-types.h b/src/backends/meta-backend-types.h index 43264a358..134374d4b 100644 --- a/src/backends/meta-backend-types.h +++ b/src/backends/meta-backend-types.h @@ -18,8 +18,7 @@ * along with this program; if not, see . */ -#ifndef META_BACKEND_TYPE_H -#define META_BACKEND_TYPE_H +#pragma once #include #include @@ -97,5 +96,3 @@ typedef struct _MetaInputCaptureSession MetaInputCaptureSession; typedef struct _MetaEis MetaEis; typedef struct _MetaEisClient MetaEisClient; - -#endif /* META_BACKEND_TYPE_H */ diff --git a/src/backends/meta-barrier-private.h b/src/backends/meta-barrier-private.h index 38b1bfa07..751b1b7df 100644 --- a/src/backends/meta-barrier-private.h +++ b/src/backends/meta-barrier-private.h @@ -23,8 +23,7 @@ * Jonas Ådahl */ -#ifndef META_BARRIER_PRIVATE_H -#define META_BARRIER_PRIVATE_H +#pragma once #include "core/meta-border.h" #include "meta/barrier.h" @@ -61,5 +60,3 @@ MetaBorder * meta_barrier_get_border (MetaBarrier *barrier); MetaBarrierFlags meta_barrier_get_flags (MetaBarrier *barrier); G_END_DECLS - -#endif /* META_BARRIER_PRIVATE_H */ diff --git a/src/backends/meta-color-device.h b/src/backends/meta-color-device.h index 33eb376ab..326595263 100644 --- a/src/backends/meta-color-device.h +++ b/src/backends/meta-color-device.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_COLOR_DEVICE_H -#define META_COLOR_DEVICE_H +#pragma once #include #include @@ -67,5 +66,3 @@ void meta_color_device_update (MetaColorDevice *color_device, META_EXPORT_TEST void meta_set_color_efivar_test_path (const char *path); - -#endif /* META_COLOR_DEVICE_H */ diff --git a/src/backends/meta-color-manager-private.h b/src/backends/meta-color-manager-private.h index 6a2a989aa..a1e8a3d32 100644 --- a/src/backends/meta-color-manager-private.h +++ b/src/backends/meta-color-manager-private.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_COLOR_MANAGER_PRIVATE_H -#define META_COLOR_MANAGER_PRIVATE_H +#pragma once #include #include @@ -41,5 +40,3 @@ META_EXPORT_TEST int meta_color_manager_get_num_color_devices (MetaColorManager *color_manager); cmsContext meta_color_manager_get_lcms_context (MetaColorManager *color_manager); - -#endif /* META_COLOR_MANAGER_PRIVATE_H */ diff --git a/src/backends/meta-color-manager.h b/src/backends/meta-color-manager.h index 246922264..39e8ea3e8 100644 --- a/src/backends/meta-color-manager.h +++ b/src/backends/meta-color-manager.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_COLOR_MANAGER_H -#define META_COLOR_MANAGER_H +#pragma once #include @@ -38,5 +37,3 @@ MetaColorDevice * meta_color_manager_get_color_device (MetaColorManager *color_m void meta_color_manager_set_brightness (MetaColorManager *color_manager, int brightness); - -#endif /* META_COLOR_MANAGER_H */ diff --git a/src/backends/meta-color-profile.h b/src/backends/meta-color-profile.h index 2b240d0b3..fb4aaf6ce 100644 --- a/src/backends/meta-color-profile.h +++ b/src/backends/meta-color-profile.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_COLOR_PROFILE_H -#define META_COLOR_PROFILE_H +#pragma once #include #include @@ -85,5 +84,3 @@ MetaColorCalibration * meta_color_calibration_new (CdIcc *cd_icc, const CdMat3x3 *adaptation_matrix); void meta_color_calibration_free (MetaColorCalibration *color_calibration); - -#endif /* META_COLOR_PROFILE_H */ diff --git a/src/backends/meta-color-store.h b/src/backends/meta-color-store.h index 1ebd1762c..a19e1b665 100644 --- a/src/backends/meta-color-store.h +++ b/src/backends/meta-color-store.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_COLOR_STORE_H -#define META_COLOR_STORE_H +#pragma once #include #include @@ -58,5 +57,3 @@ MetaColorProfile * meta_color_store_get_profile (MetaColorStore *color_store, META_EXPORT_TEST gboolean meta_color_store_has_pending_profiles (MetaColorStore *color_store); - -#endif /* META_COLOR_STORE_H */ diff --git a/src/backends/meta-crtc-mode.h b/src/backends/meta-crtc-mode.h index 6f1648403..997aec2c3 100644 --- a/src/backends/meta-crtc-mode.h +++ b/src/backends/meta-crtc-mode.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_CRTC_MODE_H -#define META_CRTC_MODE_H +#pragma once #include #include @@ -90,5 +89,3 @@ const char * meta_crtc_mode_get_name (MetaCrtcMode *crtc_mode); META_EXPORT_TEST const MetaCrtcModeInfo * meta_crtc_mode_get_info (MetaCrtcMode *crtc_mode); - -#endif /* META_CRTC_MODE_H */ diff --git a/src/backends/meta-crtc.h b/src/backends/meta-crtc.h index 0a99e0287..784b603c4 100644 --- a/src/backends/meta-crtc.h +++ b/src/backends/meta-crtc.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_CRTC_H -#define META_CRTC_H +#pragma once #include @@ -114,4 +113,3 @@ gboolean meta_gamma_lut_equal (const MetaGammaLut *gamma, G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaGammaLut, meta_gamma_lut_free) -#endif /* META_CRTC_H */ diff --git a/src/backends/meta-cursor-renderer.h b/src/backends/meta-cursor-renderer.h index 543988ad4..0214f1278 100644 --- a/src/backends/meta-cursor-renderer.h +++ b/src/backends/meta-cursor-renderer.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef META_CURSOR_RENDERER_H -#define META_CURSOR_RENDERER_H +#pragma once #include @@ -80,5 +79,3 @@ void meta_cursor_renderer_update_stage_overlay (MetaCursorRenderer *renderer, MetaCursorSprite *cursor_sprite); MetaBackend * meta_cursor_renderer_get_backend (MetaCursorRenderer *renderer); - -#endif /* META_CURSOR_RENDERER_H */ diff --git a/src/backends/meta-cursor-sprite-xcursor.h b/src/backends/meta-cursor-sprite-xcursor.h index dcb74817c..6c1f35c9c 100644 --- a/src/backends/meta-cursor-sprite-xcursor.h +++ b/src/backends/meta-cursor-sprite-xcursor.h @@ -16,8 +16,7 @@ * */ -#ifndef META_CURSOR_SPRITE_XCURSOR_H -#define META_CURSOR_SPRITE_XCURSOR_H +#pragma once #include #include @@ -41,5 +40,3 @@ XcursorImage * meta_cursor_sprite_xcursor_get_current_image (MetaCursorSpriteXcu Cursor meta_create_x_cursor (Display *xdisplay, MetaCursor cursor); - -#endif /* META_CURSOR_SPRITE_XCURSOR_H */ diff --git a/src/backends/meta-cursor-tracker-private.h b/src/backends/meta-cursor-tracker-private.h index ab4b06571..381cf73d2 100644 --- a/src/backends/meta-cursor-tracker-private.h +++ b/src/backends/meta-cursor-tracker-private.h @@ -19,8 +19,7 @@ * Author: Giovanni Campagna */ -#ifndef META_CURSOR_TRACKER_PRIVATE_H -#define META_CURSOR_TRACKER_PRIVATE_H +#pragma once #include "backends/meta-cursor.h" #include "backends/meta-cursor-renderer.h" @@ -60,5 +59,3 @@ void meta_cursor_tracker_unregister_cursor_sprite (MetaCursorTracker *tracker, MetaCursorSprite *sprite); GList * meta_cursor_tracker_peek_cursor_sprites (MetaCursorTracker *tracker); - -#endif diff --git a/src/backends/meta-cursor.h b/src/backends/meta-cursor.h index 1bf63f107..5b9da5687 100644 --- a/src/backends/meta-cursor.h +++ b/src/backends/meta-cursor.h @@ -19,8 +19,7 @@ * Author: Giovanni Campagna */ -#ifndef META_CURSOR_H -#define META_CURSOR_H +#pragma once #include "backends/meta-backend-types.h" #include "meta/common.h" @@ -93,5 +92,3 @@ gboolean meta_cursor_sprite_is_animated (MetaCursorSprite *sprite); void meta_cursor_sprite_tick_frame (MetaCursorSprite *sprite); unsigned int meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *sprite); - -#endif /* META_CURSOR_H */ diff --git a/src/backends/meta-dbus-session-manager.h b/src/backends/meta-dbus-session-manager.h index da2f027d2..7a4592ea1 100644 --- a/src/backends/meta-dbus-session-manager.h +++ b/src/backends/meta-dbus-session-manager.h @@ -18,8 +18,7 @@ * */ -#ifndef META_DBUS_SERVICE_MANAGER_H -#define META_DBUS_SERVICE_MANAGER_H +#pragma once #include #include @@ -54,5 +53,3 @@ MetaBackend * meta_dbus_session_manager_get_backend (MetaDbusSessionManager *ses GDBusConnection * meta_dbus_session_manager_get_connection (MetaDbusSessionManager *session_manager); GDBusInterfaceSkeleton * meta_dbus_session_manager_get_interface_skeleton (MetaDbusSessionManager *session_manager); - -#endif /* META_DBUS_SERVICE_MANAGER_H */ diff --git a/src/backends/meta-dbus-session-watcher.h b/src/backends/meta-dbus-session-watcher.h index ae99edba8..3a4183248 100644 --- a/src/backends/meta-dbus-session-watcher.h +++ b/src/backends/meta-dbus-session-watcher.h @@ -20,8 +20,7 @@ * */ -#ifndef META_DBUS_SESSION_WATCHER_H -#define META_DBUS_SESSION_WATCHER_H +#pragma once #include @@ -68,5 +67,3 @@ MetaDbusSessionManager * meta_dbus_session_manager (MetaDbusSessionManager *sess char * meta_dbus_session_get_peer_name (MetaDbusSession *session); char * meta_dbus_session_get_id (MetaDbusSession *session); - -#endif /* META_DBUS_SESSION_WATCHER_H */ diff --git a/src/backends/meta-display-config-shared.h b/src/backends/meta-display-config-shared.h index f037dac83..36d6ddabb 100644 --- a/src/backends/meta-display-config-shared.h +++ b/src/backends/meta-display-config-shared.h @@ -24,8 +24,7 @@ There should be no includes in this file. */ -#ifndef META_DISPLAY_CONFIG_SHARED_H -#define META_DISPLAY_CONFIG_SHARED_H +#pragma once typedef enum { @@ -35,5 +34,3 @@ typedef enum META_POWER_SAVE_SUSPEND, META_POWER_SAVE_OFF, } MetaPowerSave; - -#endif /* META_DISPLAY_CONFIG_SHARED_H */ diff --git a/src/backends/meta-dnd-private.h b/src/backends/meta-dnd-private.h index 856b88942..03503e511 100644 --- a/src/backends/meta-dnd-private.h +++ b/src/backends/meta-dnd-private.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_DND_PRIVATE__H -#define META_DND_PRIVATE__H +#pragma once #include @@ -45,5 +44,3 @@ void meta_dnd_wayland_handle_end_modal (MetaCompositor *compositor); void meta_dnd_wayland_maybe_handle_event (MetaDnd *dnd, const ClutterEvent *event); #endif - -#endif /* META_DND_PRIVATE_H */ diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h index db0b74f76..ff1c7f140 100644 --- a/src/backends/meta-egl-ext.h +++ b/src/backends/meta-egl-ext.h @@ -24,8 +24,7 @@ * SOFTWARE. */ -#ifndef META_EGL_EXT_H -#define META_EGL_EXT_H +#pragma once #include #include @@ -99,5 +98,3 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERRELEASEATTRIBNVPROC) (EGLDi #define EGL_WL_wayland_eglstream 1 #define EGL_WAYLAND_EGLSTREAM_WL 0x334B #endif /* EGL_WL_wayland_eglstream */ - -#endif /* META_EGL_EXT_H */ diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h index 83405b46a..838b93fa7 100644 --- a/src/backends/meta-egl.h +++ b/src/backends/meta-egl.h @@ -23,8 +23,7 @@ * Jonas Ådahl */ -#ifndef META_EGL_H -#define META_EGL_H +#pragma once #include #include @@ -274,5 +273,3 @@ gboolean meta_egl_query_display_attrib (MetaEgl *egl, EGLint attribute, EGLAttrib *value, GError **error); - -#endif /* META_EGL_H */ diff --git a/src/backends/meta-eis-client.h b/src/backends/meta-eis-client.h index b05b74615..c33872b6b 100644 --- a/src/backends/meta-eis-client.h +++ b/src/backends/meta-eis-client.h @@ -20,8 +20,7 @@ * */ -#ifndef META_EIS_CLIENT_H -#define META_EIS_CLIENT_H +#pragma once #include @@ -39,5 +38,3 @@ MetaEisClient *meta_eis_client_new (MetaEis *meta_eis, gboolean meta_eis_client_process_event (MetaEisClient *meta_eis_client, struct eis_event *eis_event); - -#endif /* META_EIS_H */ diff --git a/src/backends/meta-eis.h b/src/backends/meta-eis.h index 16c2f8be4..fd54cd88e 100644 --- a/src/backends/meta-eis.h +++ b/src/backends/meta-eis.h @@ -20,8 +20,7 @@ * */ -#ifndef META_EIS_H -#define META_EIS_H +#pragma once #include @@ -36,5 +35,3 @@ MetaEis * meta_eis_new (MetaBackend *backend); MetaBackend * meta_eis_get_backend (MetaEis *meta_eis); int meta_eis_add_client_get_fd (MetaEis *meta_eis); void meta_eis_remove_all_clients (MetaEis *meta_eis); - -#endif /* META_EIS_H */ diff --git a/src/backends/meta-fd-source.h b/src/backends/meta-fd-source.h index b005170c3..67e6124be 100644 --- a/src/backends/meta-fd-source.h +++ b/src/backends/meta-fd-source.h @@ -18,8 +18,7 @@ * */ -#ifndef META_FD_SOURCE_H -#define META_FD_SOURCE_H +#pragma once #include @@ -29,5 +28,3 @@ GSource * meta_create_fd_source (int fd, GSourceFunc dispatch, gpointer user_data, GDestroyNotify notify); - -#endif /* META_FD_SOURCE_H */ diff --git a/src/backends/meta-gles3-table.h b/src/backends/meta-gles3-table.h index 4cc866060..4215e0fc4 100644 --- a/src/backends/meta-gles3-table.h +++ b/src/backends/meta-gles3-table.h @@ -20,8 +20,7 @@ * */ -#ifndef META_GLES3_TABLE_H -#define META_GLES3_TABLE_H +#pragma once #include #include @@ -32,5 +31,3 @@ typedef struct _MetaGles3Table void (* glEGLImageTargetTexture2DOES) (GLenum target, GLeglImageOES image); } MetaGles3Table; - -#endif /* META_GLES3_TABLE */ diff --git a/src/backends/meta-gles3.h b/src/backends/meta-gles3.h index 89206cc8f..3d9e361aa 100644 --- a/src/backends/meta-gles3.h +++ b/src/backends/meta-gles3.h @@ -20,8 +20,7 @@ * */ -#ifndef META_GLES3_H -#define META_GLES3_H +#pragma once #include @@ -79,5 +78,3 @@ MetaGles3 * meta_gles3_new (MetaEgl *egl); g_error_free (_error); \ } \ } - -#endif /* META_GLES3_H */ diff --git a/src/backends/meta-gpu.h b/src/backends/meta-gpu.h index 9d12f95a7..8e0c59c45 100644 --- a/src/backends/meta-gpu.h +++ b/src/backends/meta-gpu.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_GPU_H -#define META_GPU_H +#pragma once #include @@ -68,5 +67,3 @@ void meta_gpu_take_crtcs (MetaGpu *gpu, META_EXPORT_TEST void meta_gpu_take_modes (MetaGpu *gpu, GList *modes); - -#endif /* META_GPU_H */ diff --git a/src/backends/meta-idle-manager.h b/src/backends/meta-idle-manager.h index c2a998feb..fb79f2fbf 100644 --- a/src/backends/meta-idle-manager.h +++ b/src/backends/meta-idle-manager.h @@ -16,8 +16,7 @@ * */ -#ifndef META_IDLE_MANAGER_H -#define META_IDLE_MANAGER_H +#pragma once #include "backends/meta-backend-types.h" #include "clutter/clutter.h" @@ -35,5 +34,3 @@ void meta_idle_manager_reset_idle_time (MetaIdleManager *idle_manager); MetaIdleManager * meta_idle_manager_new (MetaBackend *backend); void meta_idle_manager_free (MetaIdleManager *idle_manager); - -#endif /* META_IDLE_MANAGER_H */ diff --git a/src/backends/meta-idle-monitor-private.h b/src/backends/meta-idle-monitor-private.h index 6d4387876..2e1d81f0a 100644 --- a/src/backends/meta-idle-monitor-private.h +++ b/src/backends/meta-idle-monitor-private.h @@ -20,8 +20,7 @@ * from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c */ -#ifndef META_IDLE_MONITOR_PRIVATE_H -#define META_IDLE_MONITOR_PRIVATE_H +#pragma once #include "core/display-private.h" #include "meta/meta-idle-monitor.h" @@ -49,5 +48,3 @@ MetaIdleManager * meta_idle_monitor_get_manager (MetaIdleMonitor *monitor); MetaIdleMonitor * meta_idle_monitor_new (MetaIdleManager *idle_manager, ClutterInputDevice *device); - -#endif /* META_IDLE_MONITOR_PRIVATE_H */ diff --git a/src/backends/meta-input-capture-private.h b/src/backends/meta-input-capture-private.h index 93a9800b6..fa9159bac 100644 --- a/src/backends/meta-input-capture-private.h +++ b/src/backends/meta-input-capture-private.h @@ -18,8 +18,7 @@ * */ -#ifndef META_INPUT_CAPTURE_PRIVATE_H -#define META_INPUT_CAPTURE_PRIVATE_H +#pragma once #include "backends/meta-input-capture.h" @@ -28,5 +27,3 @@ void meta_input_capture_activate (MetaInputCapture *input_capture, void meta_input_capture_deactivate (MetaInputCapture *input_capture, MetaInputCaptureSession *session); - -#endif /* META_INPUT_CAPTURE_PRIVATE_H */ diff --git a/src/backends/meta-input-capture-session.h b/src/backends/meta-input-capture-session.h index 8c8668ec5..0da9c7553 100644 --- a/src/backends/meta-input-capture-session.h +++ b/src/backends/meta-input-capture-session.h @@ -18,8 +18,7 @@ * */ -#ifndef META_INPUT_CAPTURE_SESSION_H -#define META_INPUT_CAPTURE_SESSION_H +#pragma once #include @@ -44,5 +43,3 @@ gboolean meta_input_capture_session_process_event (MetaInputCaptureSession *sess const ClutterEvent *event); void meta_input_capture_session_notify_cancelled (MetaInputCaptureSession *session); - -#endif /* META_INPUT_CAPTURE_SESSION_H */ diff --git a/src/backends/meta-input-capture.h b/src/backends/meta-input-capture.h index 5196fcae1..c36c68872 100644 --- a/src/backends/meta-input-capture.h +++ b/src/backends/meta-input-capture.h @@ -18,8 +18,7 @@ * */ -#ifndef META_INPUT_CAPTURE_H -#define META_INPUT_CAPTURE_H +#pragma once #include "backends/meta-dbus-session-manager.h" #include "backends/meta-viewport-info.h" @@ -48,5 +47,3 @@ void meta_input_capture_notify_cancelled (MetaInputCapture *input_capture); gboolean meta_input_capture_process_event (MetaInputCapture *input_capture, const ClutterEvent *event); - -#endif /* META_INPUT_CAPTURE_H */ diff --git a/src/backends/meta-input-device-private.h b/src/backends/meta-input-device-private.h index d7618a869..cf0db7f37 100644 --- a/src/backends/meta-input-device-private.h +++ b/src/backends/meta-input-device-private.h @@ -16,8 +16,8 @@ * * Author: Carlos Garnacho */ -#ifndef META_INPUT_DEVICE_H -#define META_INPUT_DEVICE_H + +#pragma once #include @@ -47,5 +47,3 @@ WacomDevice * meta_input_device_get_wacom_device (MetaInputDevice *input_device) #endif MetaBackend * meta_input_device_get_backend (MetaInputDevice *input_device); - -#endif /* META_INPUT_DEVICE_H */ diff --git a/src/backends/meta-input-mapper-private.h b/src/backends/meta-input-mapper-private.h index b371a31a2..a48f60425 100644 --- a/src/backends/meta-input-mapper-private.h +++ b/src/backends/meta-input-mapper-private.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_INPUT_MAPPER_H -#define META_INPUT_MAPPER_H +#pragma once #include @@ -51,5 +50,3 @@ meta_input_mapper_get_device_logical_monitor (MetaInputMapper *mapper, GSettings * meta_input_mapper_get_tablet_settings (MetaInputMapper *mapper, ClutterInputDevice *device); - -#endif /* META_INPUT_MAPPER_H */ diff --git a/src/backends/meta-input-settings-private.h b/src/backends/meta-input-settings-private.h index 423744fb3..21407021e 100644 --- a/src/backends/meta-input-settings-private.h +++ b/src/backends/meta-input-settings-private.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_INPUT_SETTINGS_PRIVATE_H -#define META_INPUT_SETTINGS_PRIVATE_H +#pragma once #include @@ -185,5 +184,3 @@ void meta_input_settings_notify_kbd_a11y_change (MetaInputSettings *input_se MetaKeyboardA11yFlags what_changed); MetaBackend * meta_input_settings_get_backend (MetaInputSettings *input_settings); - -#endif /* META_INPUT_SETTINGS_PRIVATE_H */ diff --git a/src/backends/meta-keymap-utils.h b/src/backends/meta-keymap-utils.h index 3806824e4..91f8460bc 100644 --- a/src/backends/meta-keymap-utils.h +++ b/src/backends/meta-keymap-utils.h @@ -18,11 +18,8 @@ * along with this program; if not, see . */ -#ifndef META_KEYMAP_UTILS_H -#define META_KEYMAP_UTILS_H +#pragma once #include struct xkb_context * meta_create_xkb_context (void); - -#endif /* META_KEYMAP_UTILS_H */ diff --git a/src/backends/meta-logical-monitor.h b/src/backends/meta-logical-monitor.h index d5ef1da83..a9828c5a8 100644 --- a/src/backends/meta-logical-monitor.h +++ b/src/backends/meta-logical-monitor.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_LOGICAL_MONITOR_H -#define META_LOGICAL_MONITOR_H +#pragma once #include @@ -103,5 +102,3 @@ gboolean meta_logical_monitor_has_neighbor (MetaLogicalMonitor *logical_monito void meta_logical_monitor_foreach_crtc (MetaLogicalMonitor *logical_monitor, MetaLogicalMonitorCrtcFunc func, gpointer user_data); - -#endif /* META_LOGICAL_MONITOR_H */ diff --git a/src/backends/meta-monitor-config-manager.h b/src/backends/meta-monitor-config-manager.h index bf45b2327..c95add73b 100644 --- a/src/backends/meta-monitor-config-manager.h +++ b/src/backends/meta-monitor-config-manager.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_MONITOR_CONFIG_MANAGER_H -#define META_MONITOR_CONFIG_MANAGER_H +#pragma once #include "backends/meta-monitor.h" #include "backends/meta-monitor-manager-private.h" @@ -216,5 +215,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaLogicalMonitorConfig, meta_logical_monitor_config_free) G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaMonitorsConfigKey, meta_monitors_config_key_free) - -#endif /* META_MONITOR_CONFIG_MANAGER_H */ diff --git a/src/backends/meta-monitor-config-migration.h b/src/backends/meta-monitor-config-migration.h index 7b338ace2..990666f67 100644 --- a/src/backends/meta-monitor-config-migration.h +++ b/src/backends/meta-monitor-config-migration.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_MONITOR_CONFIG_MIGRATION_H -#define META_MONITOR_CONFIG_MIGRATION_H +#pragma once #include "backends/meta-monitor-manager-private.h" @@ -37,5 +36,3 @@ META_EXPORT_TEST gboolean meta_finish_monitors_config_migration (MetaMonitorManager *monitor_manager, MetaMonitorsConfig *config, GError **error); - -#endif /* META_MONITOR_CONFIG_MIGRATION_H */ diff --git a/src/backends/meta-monitor-config-store.h b/src/backends/meta-monitor-config-store.h index a255e370b..7d9bae9f9 100644 --- a/src/backends/meta-monitor-config-store.h +++ b/src/backends/meta-monitor-config-store.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_MONITOR_CONFIG_STORE_H -#define META_MONITOR_CONFIG_STORE_H +#pragma once #include @@ -77,5 +76,3 @@ void meta_monitor_config_store_reset (MetaMonitorConfigStore *config_store); META_EXPORT_TEST const MetaMonitorConfigPolicy * meta_monitor_config_store_get_policy (MetaMonitorConfigStore *config_store); - -#endif /* META_MONITOR_CONFIG_STORE_H */ diff --git a/src/backends/meta-monitor-manager-dummy.h b/src/backends/meta-monitor-manager-dummy.h index 72244166e..9ebac71b4 100644 --- a/src/backends/meta-monitor-manager-dummy.h +++ b/src/backends/meta-monitor-manager-dummy.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_MONITOR_MANAGER_DUMMY_H -#define META_MONITOR_MANAGER_DUMMY_H +#pragma once #include "backends/meta-crtc.h" #include "backends/meta-gpu.h" @@ -44,5 +43,3 @@ G_DECLARE_FINAL_TYPE (MetaMonitorManagerDummy, meta_monitor_manager_dummy, #define META_TYPE_GPU_DUMMY (meta_gpu_dummy_get_type ()) G_DECLARE_FINAL_TYPE (MetaGpuDummy, meta_gpu_dummy, META, GPU_DUMMY, MetaGpu) - -#endif /* META_MONITOR_MANAGER_DUMMY_H */ diff --git a/src/backends/meta-monitor-manager-private.h b/src/backends/meta-monitor-manager-private.h index 763853c6a..9516f9b95 100644 --- a/src/backends/meta-monitor-manager-private.h +++ b/src/backends/meta-monitor-manager-private.h @@ -21,8 +21,7 @@ * along with this program; if not, see . */ -#ifndef META_MONITOR_MANAGER_PRIVATE_H -#define META_MONITOR_MANAGER_PRIVATE_H +#pragma once #include #include @@ -435,5 +434,3 @@ MetaViewportInfo * meta_monitor_manager_get_viewports (MetaMonitorManager *manag GList * meta_monitor_manager_get_virtual_monitors (MetaMonitorManager *manager); void meta_monitor_manager_maybe_emit_privacy_screen_change (MetaMonitorManager *manager); - -#endif /* META_MONITOR_MANAGER_PRIVATE_H */ diff --git a/src/backends/meta-monitor-transform.h b/src/backends/meta-monitor-transform.h index 79677e8e2..7d3f0df7a 100644 --- a/src/backends/meta-monitor-transform.h +++ b/src/backends/meta-monitor-transform.h @@ -16,8 +16,7 @@ * along with this program; if not, see . */ -#ifndef META_MONITOR_TRANSFORM_H -#define META_MONITOR_TRANSFORM_H +#pragma once #include @@ -74,5 +73,3 @@ void meta_monitor_transform_transform_point (MetaMonitorTransform transform, void meta_monitor_transform_transform_matrix (MetaMonitorTransform transform, graphene_matrix_t *matrix); - -#endif /* META_MONITOR_TRANSFORM_H */ diff --git a/src/backends/meta-monitor.h b/src/backends/meta-monitor.h index c679f5368..b780fbf28 100644 --- a/src/backends/meta-monitor.h +++ b/src/backends/meta-monitor.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_MONITOR_H -#define META_MONITOR_H +#pragma once #include @@ -324,5 +323,3 @@ gboolean meta_parse_monitor_mode (const char *string, int *out_height, float *out_refresh_rate, float fallback_refresh_rate); - -#endif /* META_MONITOR_H */ diff --git a/src/backends/meta-orientation-manager.h b/src/backends/meta-orientation-manager.h index f41c84331..057d80991 100644 --- a/src/backends/meta-orientation-manager.h +++ b/src/backends/meta-orientation-manager.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_ORIENTATION_MANAGER_H -#define META_ORIENTATION_MANAGER_H +#pragma once #include @@ -47,5 +46,3 @@ MetaOrientation meta_orientation_manager_get_orientation (MetaOrientationManager META_EXPORT_TEST gboolean meta_orientation_manager_has_accelerometer (MetaOrientationManager *self); - -#endif /* META_ORIENTATION_MANAGER_H */ diff --git a/src/backends/meta-output.h b/src/backends/meta-output.h index 08e59ddd1..9681e3f4d 100644 --- a/src/backends/meta-output.h +++ b/src/backends/meta-output.h @@ -18,8 +18,7 @@ * 02111-1307, USA. */ -#ifndef META_OUTPUT_H -#define META_OUTPUT_H +#pragma once #include @@ -293,5 +292,3 @@ void meta_output_update_modes (MetaOutput *output, MetaCrtcMode *preferred_mode, MetaCrtcMode **modes, int n_modes); - -#endif /* META_OUTPUT_H */ diff --git a/src/backends/meta-pointer-constraint.h b/src/backends/meta-pointer-constraint.h index 83be1a8e9..d0ca1d402 100644 --- a/src/backends/meta-pointer-constraint.h +++ b/src/backends/meta-pointer-constraint.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_POINTER_CONSTRAINT_H -#define META_POINTER_CONSTRAINT_H +#pragma once #include @@ -77,5 +76,3 @@ void meta_pointer_constraint_impl_ensure_constrained (MetaPointerConstraintImpl ClutterInputDevice *device); G_END_DECLS - -#endif /* META_POINTER_CONSTRAINT_H */ diff --git a/src/backends/meta-remote-access-controller-private.h b/src/backends/meta-remote-access-controller-private.h index be301a5e9..de0447f33 100644 --- a/src/backends/meta-remote-access-controller-private.h +++ b/src/backends/meta-remote-access-controller-private.h @@ -18,8 +18,7 @@ * */ -#ifndef META_REMOTE_ACCESS_CONTROLLER_PRIVATE_H -#define META_REMOTE_ACCESS_CONTROLLER_PRIVATE_H +#pragma once #include "backends/meta-backend-types.h" #include "meta/meta-remote-access-controller.h" @@ -36,5 +35,3 @@ void meta_remote_access_handle_notify_stopped (MetaRemoteAccessHandle *handle); void meta_remote_access_handle_set_disable_animations (MetaRemoteAccessHandle *handle, gboolean disable_animations); - -#endif /* META_REMOTE_ACCESS_CONTROLLER_PRIVATE_H */ diff --git a/src/backends/meta-remote-desktop-session.h b/src/backends/meta-remote-desktop-session.h index f3aa2a428..8ca4c05bd 100644 --- a/src/backends/meta-remote-desktop-session.h +++ b/src/backends/meta-remote-desktop-session.h @@ -20,8 +20,7 @@ * */ -#ifndef META_REMOTE_DESKTOP_SESSION_H -#define META_REMOTE_DESKTOP_SESSION_H +#pragma once #include @@ -48,5 +47,3 @@ gboolean meta_remote_desktop_session_register_screen_cast (MetaRemoteDesktopSess void meta_remote_desktop_session_request_transfer (MetaRemoteDesktopSession *session, const char *mime_type, GTask *task); - -#endif /* META_REMOTE_DESKTOP_SESSION_H */ diff --git a/src/backends/meta-remote-desktop.h b/src/backends/meta-remote-desktop.h index 98bbb57c4..c246be38b 100644 --- a/src/backends/meta-remote-desktop.h +++ b/src/backends/meta-remote-desktop.h @@ -20,8 +20,7 @@ * */ -#ifndef META_REMOTE_DESKTOP_H -#define META_REMOTE_DESKTOP_H +#pragma once #include @@ -39,5 +38,3 @@ G_DECLARE_FINAL_TYPE (MetaRemoteDesktop, meta_remote_desktop, MetaDbusSessionManager) MetaRemoteDesktop * meta_remote_desktop_new (MetaBackend *backend); - -#endif /* META_REMOTE_DESKTOP_H */ diff --git a/src/backends/meta-renderer-view.h b/src/backends/meta-renderer-view.h index 7c4858af6..005828068 100644 --- a/src/backends/meta-renderer-view.h +++ b/src/backends/meta-renderer-view.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef META_RENDERER_VIEW_H -#define META_RENDERER_VIEW_H +#pragma once #include "backends/meta-monitor-manager-private.h" #include "backends/meta-stage-impl-private.h" @@ -37,5 +36,3 @@ MetaMonitorTransform meta_renderer_view_get_transform (MetaRendererView *view); META_EXPORT_TEST MetaCrtc *meta_renderer_view_get_crtc (MetaRendererView *view); - -#endif /* META_RENDERER_VIEW_H */ diff --git a/src/backends/meta-renderer.h b/src/backends/meta-renderer.h index 6400bec15..6280a7d80 100644 --- a/src/backends/meta-renderer.h +++ b/src/backends/meta-renderer.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_RENDERER_H -#define META_RENDERER_H +#pragma once #include @@ -75,5 +74,3 @@ gboolean meta_renderer_is_hardware_accelerated (MetaRenderer *renderer); void meta_renderer_pause (MetaRenderer *renderer); void meta_renderer_resume (MetaRenderer *renderer); - -#endif /* META_RENDERER_H */ diff --git a/src/backends/meta-screen-cast-area-stream-src.h b/src/backends/meta-screen-cast-area-stream-src.h index 72261642c..8c1f8ec98 100644 --- a/src/backends/meta-screen-cast-area-stream-src.h +++ b/src/backends/meta-screen-cast-area-stream-src.h @@ -18,8 +18,7 @@ * */ -#ifndef META_SCREEN_CAST_AREA_STREAM_SRC_H -#define META_SCREEN_CAST_AREA_STREAM_SRC_H +#pragma once #include "backends/meta-screen-cast-stream-src.h" @@ -33,5 +32,3 @@ G_DECLARE_FINAL_TYPE (MetaScreenCastAreaStreamSrc, MetaScreenCastAreaStreamSrc * meta_screen_cast_area_stream_src_new (MetaScreenCastAreaStream *area_stream, GError **error); - -#endif /* META_SCREEN_CAST_AREA_STREAM_SRC_H */ diff --git a/src/backends/meta-screen-cast-area-stream.h b/src/backends/meta-screen-cast-area-stream.h index b11ec1fb9..6b1e91dc7 100644 --- a/src/backends/meta-screen-cast-area-stream.h +++ b/src/backends/meta-screen-cast-area-stream.h @@ -18,8 +18,7 @@ * */ -#ifndef META_SCREEN_CAST_AREA_STREAM_H -#define META_SCREEN_CAST_AREA_STREAM_H +#pragma once #include @@ -45,5 +44,3 @@ ClutterStage * meta_screen_cast_area_stream_get_stage (MetaScreenCastAreaStream MetaRectangle * meta_screen_cast_area_stream_get_area (MetaScreenCastAreaStream *area_stream); float meta_screen_cast_area_stream_get_scale (MetaScreenCastAreaStream *area_stream); - -#endif /* META_SCREEN_CAST_AREA_STREAM_H */ diff --git a/src/backends/meta-screen-cast-monitor-stream-src.h b/src/backends/meta-screen-cast-monitor-stream-src.h index 7417a81e0..23a634e92 100644 --- a/src/backends/meta-screen-cast-monitor-stream-src.h +++ b/src/backends/meta-screen-cast-monitor-stream-src.h @@ -20,8 +20,7 @@ * */ -#ifndef META_SCREEN_CAST_MONITOR_STREAM_SRC_H -#define META_SCREEN_CAST_MONITOR_STREAM_SRC_H +#pragma once #include "backends/meta-monitor-manager-private.h" #include "backends/meta-screen-cast-stream-src.h" @@ -36,5 +35,3 @@ G_DECLARE_FINAL_TYPE (MetaScreenCastMonitorStreamSrc, MetaScreenCastMonitorStreamSrc * meta_screen_cast_monitor_stream_src_new (MetaScreenCastMonitorStream *monitor_stream, GError **error); - -#endif /* META_SCREEN_CAST_MONITOR_STREAM_SRC_H */ diff --git a/src/backends/meta-screen-cast-monitor-stream.h b/src/backends/meta-screen-cast-monitor-stream.h index 04c48e980..37e62988c 100644 --- a/src/backends/meta-screen-cast-monitor-stream.h +++ b/src/backends/meta-screen-cast-monitor-stream.h @@ -20,8 +20,7 @@ * */ -#ifndef META_SCREEN_CAST_MONITOR_STREAM_H -#define META_SCREEN_CAST_MONITOR_STREAM_H +#pragma once #include @@ -46,5 +45,3 @@ MetaScreenCastMonitorStream * meta_screen_cast_monitor_stream_new (MetaScreenCas ClutterStage * meta_screen_cast_monitor_stream_get_stage (MetaScreenCastMonitorStream *monitor_stream); MetaMonitor * meta_screen_cast_monitor_stream_get_monitor (MetaScreenCastMonitorStream *monitor_stream); - -#endif /* META_SCREEN_CAST_MONITOR_STREAM_H */ diff --git a/src/backends/meta-screen-cast-session.h b/src/backends/meta-screen-cast-session.h index 599f6d25b..1726d4405 100644 --- a/src/backends/meta-screen-cast-session.h +++ b/src/backends/meta-screen-cast-session.h @@ -20,8 +20,7 @@ * */ -#ifndef META_SCREEN_CAST_SESSION_H -#define META_SCREEN_CAST_SESSION_H +#pragma once #include "backends/meta-screen-cast.h" @@ -63,5 +62,3 @@ MetaScreenCast * meta_screen_cast_session_get_screen_cast (MetaScreenCastSession void meta_screen_cast_session_set_disable_animations (MetaScreenCastSession *session, gboolean disable_animations); - -#endif /* META_SCREEN_CAST_SESSION_H */ diff --git a/src/backends/meta-screen-cast-stream-src.h b/src/backends/meta-screen-cast-stream-src.h index a15ca54f1..53f59d631 100644 --- a/src/backends/meta-screen-cast-stream-src.h +++ b/src/backends/meta-screen-cast-stream-src.h @@ -20,8 +20,7 @@ * */ -#ifndef META_SCREEN_CAST_STREAM_SRC_H -#define META_SCREEN_CAST_STREAM_SRC_H +#pragma once #include #include @@ -133,4 +132,3 @@ void meta_screen_cast_stream_src_set_cursor_sprite_metadata (MetaScreenCastStrea gboolean meta_screen_cast_stream_src_uses_dma_bufs (MetaScreenCastStreamSrc *src); -#endif /* META_SCREEN_CAST_STREAM_SRC_H */ diff --git a/src/backends/meta-screen-cast-stream.h b/src/backends/meta-screen-cast-stream.h index 3424def20..b6c5b6cfe 100644 --- a/src/backends/meta-screen-cast-stream.h +++ b/src/backends/meta-screen-cast-stream.h @@ -20,8 +20,7 @@ * */ -#ifndef META_SCREEN_CAST_STREAM_H -#define META_SCREEN_CAST_STREAM_H +#pragma once #include @@ -71,4 +70,3 @@ MetaScreenCastCursorMode meta_screen_cast_stream_get_cursor_mode (MetaScreenCast MetaScreenCastFlag meta_screen_cast_stream_get_flags (MetaScreenCastStream *stream); -#endif /* META_SCREEN_CAST_STREAM_H */ diff --git a/src/backends/meta-screen-cast-virtual-stream-src.h b/src/backends/meta-screen-cast-virtual-stream-src.h index a891166bd..a76da91b5 100644 --- a/src/backends/meta-screen-cast-virtual-stream-src.h +++ b/src/backends/meta-screen-cast-virtual-stream-src.h @@ -18,8 +18,7 @@ * */ -#ifndef META_SCREEN_CAST_VIRTUAL_STREAM_SRC_H -#define META_SCREEN_CAST_VIRTUAL_STREAM_SRC_H +#pragma once #include "backends/meta-screen-cast-stream-src.h" #include "backends/meta-screen-cast-virtual-stream.h" @@ -34,5 +33,3 @@ MetaScreenCastVirtualStreamSrc * meta_screen_cast_virtual_stream_src_new (MetaSc GError **error); ClutterStageView * meta_screen_cast_virtual_stream_src_get_view (MetaScreenCastVirtualStreamSrc *virtual_src); - -#endif /* META_SCREEN_CAST_VIRTUAL_STREAM_SRC_H */ diff --git a/src/backends/meta-screen-cast-virtual-stream.h b/src/backends/meta-screen-cast-virtual-stream.h index 422db5e26..5f7dbb69e 100644 --- a/src/backends/meta-screen-cast-virtual-stream.h +++ b/src/backends/meta-screen-cast-virtual-stream.h @@ -18,8 +18,7 @@ * */ -#ifndef META_SCREEN_CAST_VIRTUAL_STREAM_H -#define META_SCREEN_CAST_VIRTUAL_STREAM_H +#pragma once #include "backends/meta-screen-cast-stream.h" @@ -36,5 +35,3 @@ MetaScreenCastVirtualStream * meta_screen_cast_virtual_stream_new (MetaScreenCas GError **error); MetaVirtualMonitor * meta_screen_cast_virtual_stream_get_virtual_monitor (MetaScreenCastVirtualStream *virtual_stream); - -#endif /* META_SCREEN_CAST_VIRTUAL_STREAM_H */ diff --git a/src/backends/meta-screen-cast-window-stream-src.h b/src/backends/meta-screen-cast-window-stream-src.h index 37f786979..d29a9cd71 100644 --- a/src/backends/meta-screen-cast-window-stream-src.h +++ b/src/backends/meta-screen-cast-window-stream-src.h @@ -18,8 +18,7 @@ * */ -#ifndef META_SCREEN_CAST_WINDOW_STREAM_SRC_H -#define META_SCREEN_CAST_WINDOW_STREAM_SRC_H +#pragma once #include "backends/meta-screen-cast-stream-src.h" @@ -33,5 +32,3 @@ G_DECLARE_FINAL_TYPE (MetaScreenCastWindowStreamSrc, MetaScreenCastWindowStreamSrc * meta_screen_cast_window_stream_src_new (MetaScreenCastWindowStream *window_stream, GError **error); - -#endif /* META_SCREEN_CAST_WINDOW_STREAM_SRC_H */ diff --git a/src/backends/meta-screen-cast-window-stream.h b/src/backends/meta-screen-cast-window-stream.h index 0acceaac6..7219ed67a 100644 --- a/src/backends/meta-screen-cast-window-stream.h +++ b/src/backends/meta-screen-cast-window-stream.h @@ -18,8 +18,7 @@ * */ -#ifndef META_SCREEN_CAST_WINDOW_STREAM_H -#define META_SCREEN_CAST_WINDOW_STREAM_H +#pragma once #include @@ -42,5 +41,3 @@ MetaScreenCastWindowStream * meta_screen_cast_window_stream_new (MetaScreenCastS MetaWindow * meta_screen_cast_window_stream_get_window (MetaScreenCastWindowStream *window_stream); int meta_screen_cast_window_stream_get_width (MetaScreenCastWindowStream *window_stream); int meta_screen_cast_window_stream_get_height (MetaScreenCastWindowStream *window_stream); - -#endif /* META_SCREEN_CAST_WINDOW_STREAM_H */ diff --git a/src/backends/meta-screen-cast-window.h b/src/backends/meta-screen-cast-window.h index a2cc4cd40..0a4985486 100644 --- a/src/backends/meta-screen-cast-window.h +++ b/src/backends/meta-screen-cast-window.h @@ -18,8 +18,7 @@ * */ -#ifndef META_SCREEN_CAST_WINDOW_H -#define META_SCREEN_CAST_WINDOW_H +#pragma once #include #include @@ -97,5 +96,3 @@ void meta_screen_cast_window_inc_usage (MetaScreenCastWindow *screen_cast_window void meta_screen_cast_window_dec_usage (MetaScreenCastWindow *screen_cast_window); G_END_DECLS - -#endif /* META_SCREEN_CAST_WINDOW_H */ diff --git a/src/backends/meta-screen-cast.h b/src/backends/meta-screen-cast.h index a68c9d175..6a314783c 100644 --- a/src/backends/meta-screen-cast.h +++ b/src/backends/meta-screen-cast.h @@ -20,8 +20,7 @@ * */ -#ifndef META_SCREEN_CAST_H -#define META_SCREEN_CAST_H +#pragma once #include @@ -59,5 +58,3 @@ CoglDmaBufHandle * meta_screen_cast_create_dma_buf_handle (MetaScreenCast *scree int height); MetaScreenCast * meta_screen_cast_new (MetaBackend *backend); - -#endif /* META_SCREEN_CAST_H */ diff --git a/src/backends/meta-settings-private.h b/src/backends/meta-settings-private.h index 87af21515..90ea6f5aa 100644 --- a/src/backends/meta-settings-private.h +++ b/src/backends/meta-settings-private.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_SETTINGS_PRIVATE_H -#define META_SETTINGS_PRIVATE_H +#pragma once #include @@ -83,5 +82,3 @@ gboolean meta_settings_is_privacy_screen_enabled (MetaSettings *settings); void meta_settings_set_privacy_screen_enabled (MetaSettings *settings, gboolean enabled); - -#endif /* META_SETTINGS_PRIVATE_H */ diff --git a/src/backends/meta-stage-impl-private.h b/src/backends/meta-stage-impl-private.h index 3620de50d..9a9ffed09 100644 --- a/src/backends/meta-stage-impl-private.h +++ b/src/backends/meta-stage-impl-private.h @@ -23,8 +23,7 @@ * */ -#ifndef META_STAGE_IMPL_PRIVATE_H -#define META_STAGE_IMPL_PRIVATE_H +#pragma once #include @@ -72,5 +71,3 @@ void meta_stage_impl_add_onscreen_frame_info (MetaStageImpl *stage_impl, ClutterStageView *view); G_END_DECLS - -#endif /* META_STAGE_IMPL_PRIVATE_H */ diff --git a/src/backends/meta-stage-private.h b/src/backends/meta-stage-private.h index 809e71a52..157803d04 100644 --- a/src/backends/meta-stage-private.h +++ b/src/backends/meta-stage-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_STAGE_PRIVATE_H -#define META_STAGE_PRIVATE_H +#pragma once #include "backends/meta-cursor.h" #include "core/util-private.h" @@ -77,5 +76,3 @@ void meta_stage_remove_watch (MetaStage *stage, MetaStageWatch *watch); G_END_DECLS - -#endif /* META_STAGE_PRIVATE_H */ diff --git a/src/backends/meta-stage-view-private.h b/src/backends/meta-stage-view-private.h index 22197e622..823490b4d 100644 --- a/src/backends/meta-stage-view-private.h +++ b/src/backends/meta-stage-view-private.h @@ -23,8 +23,7 @@ * */ -#ifndef META_STAGE_VIEW_PRIVATE_H -#define META_STAGE_VIEW_PRIVATE_H +#pragma once #include @@ -41,5 +40,3 @@ struct _MetaStageViewClass ClutterDamageHistory * meta_stage_view_get_damage_history (MetaStageView *view); void meta_stage_view_perform_fake_swap (MetaStageView *view, int64_t counter); - -#endif /* META_STAGE_VIEW_PRIVATE_H */ diff --git a/src/backends/meta-stage-view.h b/src/backends/meta-stage-view.h index 40ae6972c..83836ed96 100644 --- a/src/backends/meta-stage-view.h +++ b/src/backends/meta-stage-view.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_STAGE_VIEW_H -#define META_STAGE_VIEW_H +#pragma once #include "clutter/clutter-mutter.h" @@ -29,5 +28,3 @@ G_DECLARE_DERIVABLE_TYPE (MetaStageView, void meta_stage_view_inhibit_cursor_overlay (MetaStageView *view); void meta_stage_view_uninhibit_cursor_overlay (MetaStageView *view); - -#endif /* META_STAGE_VIEW_H */ diff --git a/src/backends/meta-viewport-info.h b/src/backends/meta-viewport-info.h index e10f5b78f..8666f52a9 100644 --- a/src/backends/meta-viewport-info.h +++ b/src/backends/meta-viewport-info.h @@ -20,8 +20,7 @@ * Carlos Garnacho */ -#ifndef META_VIEWPORT_INFO_H -#define META_VIEWPORT_INFO_H +#pragma once #include #include @@ -57,5 +56,3 @@ void meta_viewport_info_get_extents (MetaViewportInfo *info, float *height); gboolean meta_viewport_info_is_views_scaled (MetaViewportInfo *info); - -#endif /* META_VIEWPORT_INFO_H */ diff --git a/src/backends/meta-virtual-monitor.h b/src/backends/meta-virtual-monitor.h index 6699c8ece..6336fcfa1 100644 --- a/src/backends/meta-virtual-monitor.h +++ b/src/backends/meta-virtual-monitor.h @@ -18,8 +18,7 @@ * */ -#ifndef META_VIRTUAL_MONITOR_H -#define META_VIRTUAL_MONITOR_H +#pragma once #include @@ -84,5 +83,3 @@ void meta_virtual_monitor_set_mode (MetaVirtualMonitor *virtual_monitor, G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaVirtualMonitorInfo, meta_virtual_monitor_info_free) - -#endif /* META_VIRTUAL_MONITOR_H */ diff --git a/src/backends/native/dbus-utils.h b/src/backends/native/dbus-utils.h index ee56c455a..1738bd4b0 100644 --- a/src/backends/native/dbus-utils.h +++ b/src/backends/native/dbus-utils.h @@ -22,11 +22,8 @@ * Jasper St. Pierre */ -#ifndef DBUS_UTILS_H -#define DBUS_UTILS_H +#pragma once char * get_escaped_dbus_path (const char *prefix, const char *component); - -#endif /* DBUS_UTILS_H */ diff --git a/src/backends/native/meta-backend-native-private.h b/src/backends/native/meta-backend-native-private.h index 510fef8dc..f1cbbf28b 100644 --- a/src/backends/native/meta-backend-native-private.h +++ b/src/backends/native/meta-backend-native-private.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_BACKEND_NATIVE_PRIVATE_H -#define META_BACKEND_NATIVE_PRIVATE_H +#pragma once #include "backends/native/meta-backend-native.h" #include "backends/native/meta-barrier-native.h" @@ -37,5 +36,3 @@ MetaDevicePool * meta_backend_native_get_device_pool (MetaBackendNative *native) MetaRenderDevice * meta_backend_native_take_render_device (MetaBackendNative *backend_native, const char *device_path, GError **error); - -#endif /* META_BACKEND_NATIVE_PRIVATE_H */ diff --git a/src/backends/native/meta-backend-native-types.h b/src/backends/native/meta-backend-native-types.h index 3d98b3207..80b4515f8 100644 --- a/src/backends/native/meta-backend-native-types.h +++ b/src/backends/native/meta-backend-native-types.h @@ -18,8 +18,7 @@ * */ -#ifndef META_BACKEND_NATIVE_TYPES_H -#define META_BACKEND_NATIVE_TYPES_H +#pragma once typedef struct _MetaBackendNative MetaBackendNative; typedef struct _MetaSeatNative MetaSeatNative; @@ -46,5 +45,3 @@ typedef enum _MetaBackendNativeMode META_BACKEND_NATIVE_MODE_HEADLESS, META_BACKEND_NATIVE_MODE_TEST, } MetaBackendNativeMode; - -#endif /* META_BACKEND_NATIVE_TYPES_H */ diff --git a/src/backends/native/meta-backend-native.h b/src/backends/native/meta-backend-native.h index 85f1cbe97..0182b85ba 100644 --- a/src/backends/native/meta-backend-native.h +++ b/src/backends/native/meta-backend-native.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef META_BACKEND_NATIVE_H -#define META_BACKEND_NATIVE_H +#pragma once #include "backends/meta-backend-private.h" #include "backends/native/meta-clutter-backend-native.h" @@ -55,5 +54,3 @@ META_EXPORT_TEST MetaKms * meta_backend_native_get_kms (MetaBackendNative *native); const char * meta_backend_native_get_seat_id (MetaBackendNative *backend_native); - -#endif /* META_BACKEND_NATIVE_H */ diff --git a/src/backends/native/meta-barrier-native.h b/src/backends/native/meta-barrier-native.h index 1bcf56c7c..00ba6a005 100644 --- a/src/backends/native/meta-barrier-native.h +++ b/src/backends/native/meta-barrier-native.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_BARRIER_NATIVE_H -#define META_BARRIER_NATIVE_H +#pragma once #include "backends/meta-barrier-private.h" @@ -48,5 +47,3 @@ void meta_barrier_manager_native_process_in_impl (MetaBarrierManagerNative *mana float *y); G_END_DECLS - -#endif /* META_BARRIER_NATIVE_H */ diff --git a/src/backends/native/meta-clutter-backend-native.h b/src/backends/native/meta-clutter-backend-native.h index 432c72083..866146411 100644 --- a/src/backends/native/meta-clutter-backend-native.h +++ b/src/backends/native/meta-clutter-backend-native.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_CLUTTER_BACKEND_NATIVE_H -#define META_CLUTTER_BACKEND_NATIVE_H +#pragma once #include @@ -37,5 +36,3 @@ G_DECLARE_FINAL_TYPE (MetaClutterBackendNative, meta_clutter_backend_native, ClutterBackend) MetaClutterBackendNative * meta_clutter_backend_native_new (MetaBackend *backend); - -#endif /* META_CLUTTER_BACKEND_NATIVE_H */ diff --git a/src/backends/native/meta-crtc-kms.h b/src/backends/native/meta-crtc-kms.h index 0cd0f2239..17f39790c 100644 --- a/src/backends/native/meta-crtc-kms.h +++ b/src/backends/native/meta-crtc-kms.h @@ -20,8 +20,7 @@ * 02111-1307, USA. */ -#ifndef META_CRTC_KMS_H -#define META_CRTC_KMS_H +#pragma once #include #include @@ -80,5 +79,3 @@ MetaCrtcKms * meta_crtc_kms_from_kms_crtc (MetaKmsCrtc *kms_crtc); MetaCrtcKms * meta_crtc_kms_new (MetaGpuKms *gpu_kms, MetaKmsCrtc *kms_crtc); - -#endif /* META_CRTC_KMS_H */ diff --git a/src/backends/native/meta-crtc-mode-kms.h b/src/backends/native/meta-crtc-mode-kms.h index f39268612..3da844ad3 100644 --- a/src/backends/native/meta-crtc-mode-kms.h +++ b/src/backends/native/meta-crtc-mode-kms.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_CRTC_MODE_KMS_H -#define META_CRTC_MODE_KMS_H +#pragma once #include #include @@ -35,5 +34,3 @@ MetaKmsMode * meta_crtc_mode_kms_get_kms_mode (MetaCrtcModeKms *mode_kms); MetaCrtcModeKms * meta_crtc_mode_kms_new (MetaKmsMode *kms_mode, uint64_t id); - -#endif /* META_CRTC_MODE_KMS_H */ diff --git a/src/backends/native/meta-crtc-mode-virtual.h b/src/backends/native/meta-crtc-mode-virtual.h index a5c63cee3..c249b17dc 100644 --- a/src/backends/native/meta-crtc-mode-virtual.h +++ b/src/backends/native/meta-crtc-mode-virtual.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_CRTC_MODE_VIRTUAL_H -#define META_CRTC_MODE_VIRTUAL_H +#pragma once #include "backends/meta-backend-types.h" #include "backends/meta-crtc-mode.h" @@ -30,5 +29,3 @@ G_DECLARE_FINAL_TYPE (MetaCrtcModeVirtual, meta_crtc_mode_virtual, MetaCrtcModeVirtual * meta_crtc_mode_virtual_new (uint64_t id, const MetaVirtualModeInfo *info); - -#endif /* META_CRTC_MODE_VIRTUAL_H */ diff --git a/src/backends/native/meta-crtc-native.h b/src/backends/native/meta-crtc-native.h index c373604ee..5bd29aef2 100644 --- a/src/backends/native/meta-crtc-native.h +++ b/src/backends/native/meta-crtc-native.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_CRTC_NATIVE_H -#define META_CRTC_NATIVE_H +#pragma once #include "backends/meta-crtc.h" @@ -40,5 +39,3 @@ gboolean meta_crtc_native_is_transform_handled (MetaCrtcNative *crtc_nativ MetaMonitorTransform transform); gboolean meta_crtc_native_is_hw_cursor_supported (MetaCrtcNative *crtc_native); - -#endif /* META_CRTC_NATIVE_H */ diff --git a/src/backends/native/meta-crtc-virtual.h b/src/backends/native/meta-crtc-virtual.h index ffabd8958..75d5d49c4 100644 --- a/src/backends/native/meta-crtc-virtual.h +++ b/src/backends/native/meta-crtc-virtual.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_CRTC_VIRTUAL_H -#define META_CRTC_VIRTUAL_H +#pragma once #include "backends/native/meta-crtc-native.h" @@ -29,5 +28,3 @@ G_DECLARE_FINAL_TYPE (MetaCrtcVirtual, meta_crtc_virtual, MetaCrtcVirtual * meta_crtc_virtual_new (MetaBackend *backend, uint64_t id); - -#endif /* META_CRTC_VIRTUAL_H */ diff --git a/src/backends/native/meta-cursor-renderer-native.h b/src/backends/native/meta-cursor-renderer-native.h index fae221a5d..c43fbc361 100644 --- a/src/backends/native/meta-cursor-renderer-native.h +++ b/src/backends/native/meta-cursor-renderer-native.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef META_CURSOR_RENDERER_NATIVE_H -#define META_CURSOR_RENDERER_NATIVE_H +#pragma once #include "backends/meta-cursor-renderer.h" #include "backends/native/meta-backend-native-types.h" @@ -40,5 +39,3 @@ void meta_cursor_renderer_native_prepare_frame (MetaCursorRendererNative *cursor MetaCursorRendererNative * meta_cursor_renderer_native_new (MetaBackend *backend, ClutterInputDevice *device); - -#endif /* META_CURSOR_RENDERER_NATIVE_H */ diff --git a/src/backends/native/meta-device-pool-private.h b/src/backends/native/meta-device-pool-private.h index d095ec308..b83019d33 100644 --- a/src/backends/native/meta-device-pool-private.h +++ b/src/backends/native/meta-device-pool-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_DEVICE_POOL_PRIVATE_H -#define META_DEVICE_POOL_PRIVATE_H +#pragma once #include @@ -32,5 +31,3 @@ G_DECLARE_FINAL_TYPE (MetaDevicePool, meta_device_pool, GObject) MetaDevicePool * meta_device_pool_new (MetaBackendNative *backend_native); - -#endif /* META_DEVICE_POOL_PRIVATE_H */ diff --git a/src/backends/native/meta-device-pool.h b/src/backends/native/meta-device-pool.h index d44105f8d..f6950352b 100644 --- a/src/backends/native/meta-device-pool.h +++ b/src/backends/native/meta-device-pool.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_DEVICE_POOL_H -#define META_DEVICE_POOL_H +#pragma once #include #include @@ -71,5 +70,3 @@ MetaDeviceFile * meta_device_pool_open (MetaDevicePool *pool, MetaBackend * meta_device_pool_get_backend (MetaDevicePool *pool); G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaDeviceFile, meta_device_file_release) - -#endif /* META_DEVICE_FILE_POOL_H */ diff --git a/src/backends/native/meta-drm-buffer-dumb.h b/src/backends/native/meta-drm-buffer-dumb.h index 3ab05727b..98b6bb8fb 100644 --- a/src/backends/native/meta-drm-buffer-dumb.h +++ b/src/backends/native/meta-drm-buffer-dumb.h @@ -19,8 +19,7 @@ * */ -#ifndef META_DRM_BUFFER_DUMB_H -#define META_DRM_BUFFER_DUMB_H +#pragma once #include "backends/native/meta-backend-native-types.h" #include "backends/native/meta-drm-buffer-private.h" @@ -42,5 +41,3 @@ int meta_drm_buffer_dumb_ensure_dmabuf_fd (MetaDrmBufferDumb *buffer_dumb, GError **error); void * meta_drm_buffer_dumb_get_data (MetaDrmBufferDumb *buffer_dumb); - -#endif /* META_DRM_BUFFER_DUMB_H */ diff --git a/src/backends/native/meta-drm-buffer-gbm.h b/src/backends/native/meta-drm-buffer-gbm.h index ab994a25d..dc725bb05 100644 --- a/src/backends/native/meta-drm-buffer-gbm.h +++ b/src/backends/native/meta-drm-buffer-gbm.h @@ -19,8 +19,7 @@ * */ -#ifndef META_DRM_BUFFER_GBM_H -#define META_DRM_BUFFER_GBM_H +#pragma once #include @@ -45,5 +44,3 @@ MetaDrmBufferGbm * meta_drm_buffer_gbm_new_take (MetaDeviceFile *device_fil GError **error); struct gbm_bo * meta_drm_buffer_gbm_get_bo (MetaDrmBufferGbm *buffer_gbm); - -#endif /* META_DRM_BUFFER_GBM_H */ diff --git a/src/backends/native/meta-drm-buffer-import.h b/src/backends/native/meta-drm-buffer-import.h index faff560fa..df2125d9d 100644 --- a/src/backends/native/meta-drm-buffer-import.h +++ b/src/backends/native/meta-drm-buffer-import.h @@ -20,8 +20,7 @@ * */ -#ifndef META_DRM_BUFFER_IMPORT_H -#define META_DRM_BUFFER_IMPORT_H +#pragma once #include @@ -51,5 +50,3 @@ MetaDrmBufferImport * meta_drm_buffer_import_new (MetaDeviceFile *device_fil struct gbm_device *gbm_device, MetaDrmBufferGbm *buffer_gbm, GError **error); - -#endif /* META_DRM_BUFFER_IMPORT_H */ diff --git a/src/backends/native/meta-drm-buffer-private.h b/src/backends/native/meta-drm-buffer-private.h index a69b80e97..4d057b717 100644 --- a/src/backends/native/meta-drm-buffer-private.h +++ b/src/backends/native/meta-drm-buffer-private.h @@ -18,8 +18,7 @@ * 02111-1307, USA. */ -#ifndef META_DRM_BUFFER_PRIVATE_H -#define META_DRM_BUFFER_PRIVATE_H +#pragma once #include "backends/native/meta-backend-native-types.h" #include "backends/native/meta-drm-buffer.h" @@ -61,5 +60,3 @@ MetaDeviceFile * meta_drm_buffer_get_device_file (MetaDrmBuffer *buffer); gboolean meta_drm_buffer_do_ensure_fb_id (MetaDrmBuffer *buffer, const MetaDrmFbArgs *fb_args, GError **error); - -#endif /* META_DRM_BUFFER_PRIVATE_H */ diff --git a/src/backends/native/meta-drm-buffer.h b/src/backends/native/meta-drm-buffer.h index 59c3c09c2..89e366f0e 100644 --- a/src/backends/native/meta-drm-buffer.h +++ b/src/backends/native/meta-drm-buffer.h @@ -20,8 +20,7 @@ * Author: Daniel van Vugt */ -#ifndef META_DRM_BUFFER_H -#define META_DRM_BUFFER_H +#pragma once #include #include @@ -67,5 +66,3 @@ int meta_drm_buffer_get_offset (MetaDrmBuffer *buffer, int plane); uint64_t meta_drm_buffer_get_modifier (MetaDrmBuffer *buffer); - -#endif /* META_DRM_BUFFER_H */ diff --git a/src/backends/native/meta-frame-native.h b/src/backends/native/meta-frame-native.h index c0b864fe7..6d5cca360 100644 --- a/src/backends/native/meta-frame-native.h +++ b/src/backends/native/meta-frame-native.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_FRAME_NATIVE_H -#define META_FRAME_NATIVE_H +#pragma once #include "backends/native/meta-kms-types.h" #include "clutter/clutter.h" @@ -45,5 +44,3 @@ gboolean meta_frame_native_has_kms_update (MetaFrameNative *frame_native); META_EXPORT_TEST gboolean meta_frame_native_had_kms_update (MetaFrameNative *frame_native); - -#endif /* META_FRAME_NATIVE_H */ diff --git a/src/backends/native/meta-gpu-kms.h b/src/backends/native/meta-gpu-kms.h index 7a890c845..b55c8244c 100644 --- a/src/backends/native/meta-gpu-kms.h +++ b/src/backends/native/meta-gpu-kms.h @@ -20,8 +20,7 @@ * 02111-1307, USA. */ -#ifndef META_GPU_KMS_H -#define META_GPU_KMS_H +#pragma once #include #include @@ -66,5 +65,3 @@ MetaGpuKmsFlipClosureContainer * meta_gpu_kms_wrap_flip_closure (MetaGpuKms *gpu GClosure *flip_closure); void meta_gpu_kms_flip_closure_container_free (MetaGpuKmsFlipClosureContainer *closure_container); - -#endif /* META_GPU_KMS_H */ diff --git a/src/backends/native/meta-input-device-native.h b/src/backends/native/meta-input-device-native.h index 802e3bc9e..82fed2d3a 100644 --- a/src/backends/native/meta-input-device-native.h +++ b/src/backends/native/meta-input-device-native.h @@ -23,8 +23,7 @@ * Author: Jonas Ådahl */ -#ifndef META_INPUT_DEVICE_NATIVE_H -#define META_INPUT_DEVICE_NATIVE_H +#pragma once #ifndef META_INPUT_THREAD_H_INSIDE #error "This header cannot be included directly. Use "backends/native/meta-input-thread.h"" @@ -173,5 +172,3 @@ void meta_input_device_native_get_coords_in_impl (MetaInputD gboolean meta_input_device_native_process_kbd_a11y_event_in_impl (ClutterInputDevice *device, ClutterEvent *event); void meta_input_device_native_detach_libinput_in_impl (MetaInputDeviceNative *device_native); - -#endif /* META_INPUT_DEVICE_NATIVE_H */ diff --git a/src/backends/native/meta-input-device-tool-native.h b/src/backends/native/meta-input-device-tool-native.h index fa12358ad..edcf5c10e 100644 --- a/src/backends/native/meta-input-device-tool-native.h +++ b/src/backends/native/meta-input-device-tool-native.h @@ -17,8 +17,7 @@ * Author: Carlos Garnacho */ -#ifndef META_INPUT_DEVICE_NATIVE_TOOL_H -#define META_INPUT_DEVICE_NATIVE_TOOL_H +#pragma once #ifndef META_INPUT_THREAD_H_INSIDE #error "This header cannot be included directly. Use "backends/native/meta-input-thread.h"" @@ -86,5 +85,3 @@ void meta_input_device_tool_native_set_button_code_in_impl ( uint32_t evcode); G_END_DECLS - -#endif /* META_INPUT_DEVICE_NATIVE_TOOL_H */ diff --git a/src/backends/native/meta-input-settings-native.h b/src/backends/native/meta-input-settings-native.h index cddd5b15f..168f32d11 100644 --- a/src/backends/native/meta-input-settings-native.h +++ b/src/backends/native/meta-input-settings-native.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_INPUT_SETTINGS_NATIVE_H -#define META_INPUT_SETTINGS_NATIVE_H +#pragma once #ifndef META_INPUT_THREAD_H_INSIDE #error "This header cannot be included directly. Use "backends/native/meta-input-thread.h"" @@ -52,5 +51,3 @@ struct _MetaInputSettingsNativeClass GType meta_input_settings_native_get_type (void) G_GNUC_CONST; MetaInputSettings * meta_input_settings_native_new_in_impl (MetaSeatImpl *seat_impl); - -#endif /* META_INPUT_SETTINGS_NATIVE_H */ diff --git a/src/backends/native/meta-input-thread.h b/src/backends/native/meta-input-thread.h index 196adc27b..7ded41ed8 100644 --- a/src/backends/native/meta-input-thread.h +++ b/src/backends/native/meta-input-thread.h @@ -17,8 +17,7 @@ * Author: Carlos Garnacho */ -#ifndef META_INPUT_THREAD_H -#define META_INPUT_THREAD_H +#pragma once #define META_INPUT_THREAD_H_INSIDE @@ -29,5 +28,3 @@ #include "src/backends/native/meta-seat-impl.h" #undef META_INPUT_THREAD_H_INSIDE - -#endif /* META_INPUT_THREAD_H */ diff --git a/src/backends/native/meta-keymap-native.h b/src/backends/native/meta-keymap-native.h index 0aa62d085..d48d9d841 100644 --- a/src/backends/native/meta-keymap-native.h +++ b/src/backends/native/meta-keymap-native.h @@ -18,8 +18,8 @@ * * Author: Carlos Garnacho */ -#ifndef META_KEYMAP_NATIVE_H -#define META_KEYMAP_NATIVE_H + +#pragma once #ifndef META_INPUT_THREAD_H_INSIDE #error "This header cannot be included directly. Use "backends/native/meta-input-thread.h"" @@ -40,4 +40,3 @@ void meta_keymap_native_update_in_impl (MetaKeymapNative *keymap, MetaSeatImpl *seat_impl, struct xkb_state *xkb_state); -#endif /* META_KEYMAP_NATIVE_H */ diff --git a/src/backends/native/meta-kms-connector-private.h b/src/backends/native/meta-kms-connector-private.h index c5ae9e251..2db2b4c5f 100644 --- a/src/backends/native/meta-kms-connector-private.h +++ b/src/backends/native/meta-kms-connector-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_CONNECTOR_PRIVATE_H -#define META_KMS_CONNECTOR_PRIVATE_H +#pragma once #include "backends/native/meta-kms-connector.h" @@ -155,5 +154,3 @@ gboolean set_output_hdr_metadata (struct hdr_output_metadata *drm_metadata, META_EXPORT_TEST gboolean hdr_metadata_equal (MetaOutputHdrMetadata *metadata, MetaOutputHdrMetadata *other_metadata); - -#endif /* META_KMS_CONNECTOR_PRIVATE_H */ diff --git a/src/backends/native/meta-kms-connector.h b/src/backends/native/meta-kms-connector.h index be946a506..db77db943 100644 --- a/src/backends/native/meta-kms-connector.h +++ b/src/backends/native/meta-kms-connector.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_CONNECTOR_H -#define META_KMS_CONNECTOR_H +#pragma once #include #include @@ -102,5 +101,3 @@ gboolean meta_kms_connector_is_color_space_supported (MetaKmsConnector *conn MetaOutputColorspace color_space); gboolean meta_kms_connector_is_hdr_metadata_supported (MetaKmsConnector *connector); - -#endif /* META_KMS_CONNECTOR_H */ diff --git a/src/backends/native/meta-kms-crtc-private.h b/src/backends/native/meta-kms-crtc-private.h index d4d915786..7d366f5d0 100644 --- a/src/backends/native/meta-kms-crtc-private.h +++ b/src/backends/native/meta-kms-crtc-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_CRTC_PRIVATE_H -#define META_KMS_CRTC_PRIVATE_H +#pragma once #include @@ -60,5 +59,3 @@ gboolean meta_kms_crtc_determine_deadline (MetaKmsCrtc *crtc, int64_t *out_next_deadline_us, int64_t *out_next_presentation_us, GError **error); - -#endif /* META_KMS_CRTC_PRIVATE_H */ diff --git a/src/backends/native/meta-kms-crtc.h b/src/backends/native/meta-kms-crtc.h index 25fb71edb..b7c8dd426 100644 --- a/src/backends/native/meta-kms-crtc.h +++ b/src/backends/native/meta-kms-crtc.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_CRTC_H -#define META_KMS_CRTC_H +#pragma once #include #include @@ -63,5 +62,3 @@ int meta_kms_crtc_get_idx (MetaKmsCrtc *crtc); META_EXPORT_TEST gboolean meta_kms_crtc_is_active (MetaKmsCrtc *crtc); - -#endif /* META_KMS_CRTC_H */ diff --git a/src/backends/native/meta-kms-cursor-manager.h b/src/backends/native/meta-kms-cursor-manager.h index 20dffb0f1..61aac7903 100644 --- a/src/backends/native/meta-kms-cursor-manager.h +++ b/src/backends/native/meta-kms-cursor-manager.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_CURSOR_MANAGER_H -#define META_KMS_CURSOR_MANAGER_H +#pragma once #include #include @@ -60,5 +59,3 @@ void meta_kms_cursor_manager_update_sprite (MetaKmsCursorManager *cursor_manag META_EXPORT_TEST void meta_kms_cursor_manager_update_crtc_layout (MetaKmsCursorManager *cursor_manager, GArray *layouts); - -#endif /* META_KMS_CURSOR_MANAGER_H */ diff --git a/src/backends/native/meta-kms-device-private.h b/src/backends/native/meta-kms-device-private.h index 77101056d..db6661c34 100644 --- a/src/backends/native/meta-kms-device-private.h +++ b/src/backends/native/meta-kms-device-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_DEVICE_PRIVATE_H -#define META_KMS_DEVICE_PRIVATE_H +#pragma once #include "backends/native/meta-kms-types.h" #include "backends/native/meta-kms-update-private.h" @@ -42,5 +41,3 @@ MetaKmsConnector * meta_kms_device_find_connector_in_impl (MetaKmsDevice *device void meta_kms_device_set_needs_flush (MetaKmsDevice *device, MetaKmsCrtc *crtc); - -#endif /* META_KMS_DEVICE_PRIVATE_H */ diff --git a/src/backends/native/meta-kms-device.h b/src/backends/native/meta-kms-device.h index c633c6e47..2d1779dff 100644 --- a/src/backends/native/meta-kms-device.h +++ b/src/backends/native/meta-kms-device.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_DEVICE_H -#define META_KMS_DEVICE_H +#pragma once #include @@ -98,5 +97,3 @@ MetaKmsDevice * meta_kms_device_new (MetaKms *kms, const char *path, MetaKmsDeviceFlag flags, GError **error); - -#endif /* META_KMS_DEVICE_H */ diff --git a/src/backends/native/meta-kms-impl-device-atomic.h b/src/backends/native/meta-kms-impl-device-atomic.h index 99aa066db..06e06e82e 100644 --- a/src/backends/native/meta-kms-impl-device-atomic.h +++ b/src/backends/native/meta-kms-impl-device-atomic.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_IMPL_DEVICE_ATOMIC_H -#define META_KMS_IMPL_DEVICE_ATOMIC_H +#pragma once #include "backends/native/meta-kms-impl-device.h" @@ -26,5 +25,3 @@ META_EXPORT_TEST G_DECLARE_FINAL_TYPE (MetaKmsImplDeviceAtomic, meta_kms_impl_device_atomic, META, KMS_IMPL_DEVICE_ATOMIC, MetaKmsImplDevice) - -#endif /* META_KMS_IMPL_DEVICE_ATOMIC_H */ diff --git a/src/backends/native/meta-kms-impl-device-dummy.h b/src/backends/native/meta-kms-impl-device-dummy.h index 9576939ad..bd41b24f3 100644 --- a/src/backends/native/meta-kms-impl-device-dummy.h +++ b/src/backends/native/meta-kms-impl-device-dummy.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_IMPL_DEVICE_DUMMY_H -#define META_KMS_IMPL_DEVICE_DUMMY_H +#pragma once #include "backends/native/meta-kms-impl-device.h" @@ -26,5 +25,3 @@ G_DECLARE_FINAL_TYPE (MetaKmsImplDeviceDummy, meta_kms_impl_device_dummy, META, KMS_IMPL_DEVICE_DUMMY, MetaKmsImplDevice) - -#endif /* META_KMS_IMPL_DEVICE_DUMMY_H */ diff --git a/src/backends/native/meta-kms-impl-device-simple.h b/src/backends/native/meta-kms-impl-device-simple.h index aeea434fd..d1854dc70 100644 --- a/src/backends/native/meta-kms-impl-device-simple.h +++ b/src/backends/native/meta-kms-impl-device-simple.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_IMPL_DEVICE_SIMPLE_H -#define META_KMS_IMPL_DEVICE_SIMPLE_H +#pragma once #include "backends/native/meta-kms-impl-device.h" @@ -26,5 +25,3 @@ META_EXPORT_TEST G_DECLARE_FINAL_TYPE (MetaKmsImplDeviceSimple, meta_kms_impl_device_simple, META, KMS_IMPL_DEVICE_SIMPLE, MetaKmsImplDevice) - -#endif /* META_KMS_IMPL_DEVICE_SIMPLE_H */ diff --git a/src/backends/native/meta-kms-impl-device.h b/src/backends/native/meta-kms-impl-device.h index 4f7d124cf..3076fd38a 100644 --- a/src/backends/native/meta-kms-impl-device.h +++ b/src/backends/native/meta-kms-impl-device.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_IMPL_DEVICE_H -#define META_KMS_IMPL_DEVICE_H +#pragma once #include #include @@ -200,5 +199,3 @@ void meta_kms_impl_device_prepare_shutdown (MetaKmsImplDevice *impl_device); uint64_t meta_kms_prop_convert_value (MetaKmsProp *prop, uint64_t value); - -#endif /* META_KMS_IMPL_DEVICE_H */ diff --git a/src/backends/native/meta-kms-impl.h b/src/backends/native/meta-kms-impl.h index 04bd1b089..78aa2c70f 100644 --- a/src/backends/native/meta-kms-impl.h +++ b/src/backends/native/meta-kms-impl.h @@ -18,8 +18,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_IMPL_H -#define META_KMS_IMPL_H +#pragma once #include "backends/native/meta-kms-impl-device.h" #include "backends/native/meta-kms-page-flip-private.h" @@ -65,5 +64,3 @@ MetaKmsUpdate * meta_kms_impl_filter_update (MetaKmsImpl *impl, MetaKmsCrtc *crtc, MetaKmsUpdate *update, MetaKmsUpdateFlag flags); - -#endif /* META_KMS_IMPL_H */ diff --git a/src/backends/native/meta-kms-mode-private.h b/src/backends/native/meta-kms-mode-private.h index 4969c824e..ae1ee8531 100644 --- a/src/backends/native/meta-kms-mode-private.h +++ b/src/backends/native/meta-kms-mode-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_MODE_PRIVATE_H -#define META_KMS_MODE_PRIVATE_H +#pragma once #include "backends/native/meta-kms-mode.h" @@ -34,5 +33,3 @@ void meta_kms_mode_free (MetaKmsMode *mode); MetaKmsMode * meta_kms_mode_new (MetaKmsImplDevice *impl_device, const drmModeModeInfo *drm_mode, MetaKmsModeFlag flags); - -#endif /* META_KMS_MODE_PRIVATE_H */ diff --git a/src/backends/native/meta-kms-mode.h b/src/backends/native/meta-kms-mode.h index 63650834e..1c87d6bfe 100644 --- a/src/backends/native/meta-kms-mode.h +++ b/src/backends/native/meta-kms-mode.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_MODE_H -#define META_KMS_MODE_H +#pragma once #include #include @@ -55,5 +54,3 @@ gboolean meta_drm_mode_equal (const drmModeModeInfo *one, const drmModeModeInfo *two); unsigned int meta_kms_mode_hash (MetaKmsMode *mode); - -#endif /* META_KMS_MODE_H */ diff --git a/src/backends/native/meta-kms-page-flip-private.h b/src/backends/native/meta-kms-page-flip-private.h index f1079014b..b02dcaf9f 100644 --- a/src/backends/native/meta-kms-page-flip-private.h +++ b/src/backends/native/meta-kms-page-flip-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_PAGE_FLIP_H -#define META_KMS_PAGE_FLIP_H +#pragma once #include @@ -64,5 +63,3 @@ void meta_kms_page_flip_data_take_error (MetaKmsPageFlipData *page_flip_data, void meta_kms_page_flip_data_make_symbolic (MetaKmsPageFlipData *page_flip_data); G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaKmsPageFlipData, meta_kms_page_flip_data_unref) - -#endif /* META_KMS_PAGE_FLIP_H */ diff --git a/src/backends/native/meta-kms-plane-private.h b/src/backends/native/meta-kms-plane-private.h index c5bfa6fa1..0319de73a 100644 --- a/src/backends/native/meta-kms-plane-private.h +++ b/src/backends/native/meta-kms-plane-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_PLANE_PRIVATE_H -#define META_KMS_PLANE_PRIVATE_H +#pragma once #include #include @@ -87,5 +86,3 @@ uint64_t meta_kms_plane_get_prop_drm_value (MetaKmsPlane *plane, MetaKmsPropType meta_kms_plane_get_prop_internal_type (MetaKmsPlane *plane, MetaKmsPlaneProp prop); - -#endif /* META_KMS_PLANE_PRIVATE_H */ diff --git a/src/backends/native/meta-kms-plane.h b/src/backends/native/meta-kms-plane.h index b0a9d4471..1e520b1fd 100644 --- a/src/backends/native/meta-kms-plane.h +++ b/src/backends/native/meta-kms-plane.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_PLANE_H -#define META_KMS_PLANE_H +#pragma once #include #include @@ -65,5 +64,3 @@ gboolean meta_kms_plane_is_usable_with (MetaKmsPlane *plane, void meta_kms_plane_update_set_rotation (MetaKmsPlane *plane, MetaKmsPlaneAssignment *plane_assignment, MetaMonitorTransform transform); - -#endif /* META_KMS_PLANE_H */ diff --git a/src/backends/native/meta-kms-private.h b/src/backends/native/meta-kms-private.h index 6aa36d3f7..4dafedfb1 100644 --- a/src/backends/native/meta-kms-private.h +++ b/src/backends/native/meta-kms-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_PRIVATE_H -#define META_KMS_PRIVATE_H +#pragma once #include "backends/native/meta-kms.h" @@ -61,5 +60,3 @@ void meta_kms_emit_resources_changed (MetaKms *kms, g_assert (!meta_kms_in_impl_task (kms)) #define meta_assert_is_waiting_for_kms_impl_task(kms) \ g_assert (meta_kms_is_waiting_for_impl_task (kms)) - -#endif /* META_KMS_PRIVATE_H */ diff --git a/src/backends/native/meta-kms-types-private.h b/src/backends/native/meta-kms-types-private.h index 275ea00b7..ea8889c53 100644 --- a/src/backends/native/meta-kms-types-private.h +++ b/src/backends/native/meta-kms-types-private.h @@ -17,9 +17,6 @@ * 02111-1307, USA. */ -#ifndef META_KMS_TYPES_PRIVATE_H -#define META_KMS_TYPES_PRIVATE_H +#pragma once typedef struct _MetaKmsResultListener MetaKmsResultListener; - -#endif /* META_KMS_TYPES_PRIVATE_H */ diff --git a/src/backends/native/meta-kms-types.h b/src/backends/native/meta-kms-types.h index 191d1afd4..90a80a13e 100644 --- a/src/backends/native/meta-kms-types.h +++ b/src/backends/native/meta-kms-types.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_IMPL_TYPES_H -#define META_KMS_IMPL_TYPES_H +#pragma once #include @@ -99,5 +98,3 @@ typedef struct _MetaKmsRange uint64_t min_value; uint64_t max_value; } MetaKmsRange; - -#endif /* META_KMS_IMPL_TYPES_H */ diff --git a/src/backends/native/meta-kms-update-private.h b/src/backends/native/meta-kms-update-private.h index e740fe664..ca9f32578 100644 --- a/src/backends/native/meta-kms-update-private.h +++ b/src/backends/native/meta-kms-update-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_UPDATE_PRIVATE_H -#define META_KMS_UPDATE_PRIVATE_H +#pragma once #include #include @@ -218,5 +217,3 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaKmsPlaneFeedback, G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaKmsCustomPageFlip, meta_kms_custom_page_flip_free) - -#endif /* META_KMS_UPDATE_PRIVATE_H */ diff --git a/src/backends/native/meta-kms-update.h b/src/backends/native/meta-kms-update.h index 5550158e9..b5473d9ea 100644 --- a/src/backends/native/meta-kms-update.h +++ b/src/backends/native/meta-kms-update.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_UPDATE_H -#define META_KMS_UPDATE_H +#pragma once #include #include @@ -241,5 +240,3 @@ meta_fixed_16_rectangle_to_rectangle (MetaFixed16Rectangle fixed_rect) G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaKmsFeedback, meta_kms_feedback_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaKmsUpdate, meta_kms_update_free) - -#endif /* META_KMS_UPDATE_H */ diff --git a/src/backends/native/meta-kms-utils.h b/src/backends/native/meta-kms-utils.h index 2f2bad1f9..418930138 100644 --- a/src/backends/native/meta-kms-utils.h +++ b/src/backends/native/meta-kms-utils.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_UTILS_H -#define META_KMS_UTILS_H +#pragma once #include #include @@ -39,5 +38,3 @@ int64_t meta_calculate_drm_mode_vblank_duration_us (const drmModeModeInfo *drm_m const char * meta_drm_format_to_string (MetaDrmFormatBuf *tmp, uint32_t drm_format); - -#endif /* META_KMS_UTILS_H */ diff --git a/src/backends/native/meta-kms.h b/src/backends/native/meta-kms.h index f8f564299..f40b6281b 100644 --- a/src/backends/native/meta-kms.h +++ b/src/backends/native/meta-kms.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_KMS_H -#define META_KMS_H +#pragma once #include @@ -75,5 +74,3 @@ void meta_kms_uninhibit_kernel_thread (MetaKms *kms); META_EXPORT_TEST MetaKmsCursorManager * meta_kms_get_cursor_manager (MetaKms *kms); - -#endif /* META_KMS_H */ diff --git a/src/backends/native/meta-launcher.h b/src/backends/native/meta-launcher.h index c6bdca0c8..1dd99adea 100644 --- a/src/backends/native/meta-launcher.h +++ b/src/backends/native/meta-launcher.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_LAUNCHER_H -#define META_LAUNCHER_H +#pragma once #include @@ -42,6 +41,3 @@ const char * meta_launcher_get_seat_id (MetaLauncher *launcher) MetaDBusLogin1Session * meta_launcher_get_session_proxy (MetaLauncher *launcher); MetaBackend * meta_launcher_get_backend (MetaLauncher *launcher); - - -#endif /* META_LAUNCHER_H */ diff --git a/src/backends/native/meta-monitor-manager-native.h b/src/backends/native/meta-monitor-manager-native.h index fadca96ae..370f5538f 100644 --- a/src/backends/native/meta-monitor-manager-native.h +++ b/src/backends/native/meta-monitor-manager-native.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_MONITOR_MANAGER_NATIVE_H -#define META_MONITOR_MANAGER_NATIVE_H +#pragma once #include #include @@ -49,5 +48,3 @@ MetaGammaLut * meta_monitor_manager_native_get_cached_crtc_gamma (MetaMonitorMan void meta_monitor_manager_native_update_cached_crtc_gamma (MetaMonitorManagerNative *manager_native, MetaCrtcKms *crtc_kms, MetaGammaLut *gamma); - -#endif /* META_MONITOR_MANAGER_NATIVE_H */ diff --git a/src/backends/native/meta-onscreen-native.h b/src/backends/native/meta-onscreen-native.h index 3ec3277a3..3be01a33e 100644 --- a/src/backends/native/meta-onscreen-native.h +++ b/src/backends/native/meta-onscreen-native.h @@ -18,8 +18,7 @@ * */ -#ifndef META_ONSCREEN_NATIVE_H -#define META_ONSCREEN_NATIVE_H +#pragma once #include @@ -68,5 +67,3 @@ MetaCrtc * meta_onscreen_native_get_crtc (MetaOnscreenNative *onscreen_native); void meta_onscreen_native_invalidate (MetaOnscreenNative *onscreen_native); void meta_onscreen_native_detach (MetaOnscreenNative *onscreen_native); - -#endif /* META_ONSCREEN_NATIVE_H */ diff --git a/src/backends/native/meta-output-kms.h b/src/backends/native/meta-output-kms.h index a9d8f99b1..a27cf9b90 100644 --- a/src/backends/native/meta-output-kms.h +++ b/src/backends/native/meta-output-kms.h @@ -20,8 +20,7 @@ * 02111-1307, USA. */ -#ifndef META_OUTPUT_KMS_H -#define META_OUTPUT_KMS_H +#pragma once #include "backends/meta-output.h" #include "backends/native/meta-gpu-kms.h" @@ -59,5 +58,3 @@ MetaOutputKms * meta_output_kms_new (MetaGpuKms *gpu_kms, MetaKmsConnector *kms_connector, MetaOutput *old_output, GError **error); - -#endif /* META_OUTPUT_KMS_H */ diff --git a/src/backends/native/meta-output-native.h b/src/backends/native/meta-output-native.h index f0475ae3b..c1dcc3621 100644 --- a/src/backends/native/meta-output-native.h +++ b/src/backends/native/meta-output-native.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_OUTPUT_NATIVE_H -#define META_OUTPUT_NATIVE_H +#pragma once #include "backends/meta-output.h" @@ -35,5 +34,3 @@ struct _MetaOutputNativeClass }; GBytes * meta_output_native_read_edid (MetaOutputNative *output_native); - -#endif /* META_OUTPUT_NATIVE_H */ diff --git a/src/backends/native/meta-output-virtual.h b/src/backends/native/meta-output-virtual.h index b04579f0d..c4fbbfea7 100644 --- a/src/backends/native/meta-output-virtual.h +++ b/src/backends/native/meta-output-virtual.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_OUTPUT_VIRTUAL_H -#define META_OUTPUT_VIRTUAL_H +#pragma once #include "backends/native/meta-backend-native-types.h" #include "backends/native/meta-output-native.h" @@ -32,5 +31,3 @@ MetaOutputVirtual * meta_output_virtual_new (uint64_t id, const MetaVirtualMonitorInfo *info, MetaCrtcVirtual *crtc_virtual, MetaCrtcModeVirtual *crtc_mode_virtual); - -#endif /* META_OUTPUT_VIRTUAL_H */ diff --git a/src/backends/native/meta-pointer-constraint-native.h b/src/backends/native/meta-pointer-constraint-native.h index e95a0bd14..e8097121d 100644 --- a/src/backends/native/meta-pointer-constraint-native.h +++ b/src/backends/native/meta-pointer-constraint-native.h @@ -22,8 +22,7 @@ * Carlos Garnacho */ -#ifndef META_POINTER_CONSTRAINT_NATIVE_H -#define META_POINTER_CONSTRAINT_NATIVE_H +#pragma once #include @@ -43,5 +42,3 @@ MetaPointerConstraintImpl * meta_pointer_constraint_impl_native_new (MetaPointer double min_edge_distance); G_END_DECLS - -#endif /* META_POINTER_CONSTRAINT_NATIVE_H */ diff --git a/src/backends/native/meta-render-device-egl-stream.h b/src/backends/native/meta-render-device-egl-stream.h index b4b66b8b1..1d282c6f0 100644 --- a/src/backends/native/meta-render-device-egl-stream.h +++ b/src/backends/native/meta-render-device-egl-stream.h @@ -18,8 +18,7 @@ * */ -#ifndef META_RENDER_DEVICE_EGL_STREAM_H -#define META_RENDER_DEVICE_EGL_STREAM_H +#pragma once #include "backends/native/meta-render-device-private.h" @@ -31,5 +30,3 @@ G_DECLARE_FINAL_TYPE (MetaRenderDeviceEglStream, meta_render_device_egl_stream, MetaRenderDeviceEglStream * meta_render_device_egl_stream_new (MetaBackend *backend, MetaDeviceFile *device_file, GError **error); - -#endif /* META_RENDER_DEVICE_EGL_STREAM_H */ diff --git a/src/backends/native/meta-render-device-gbm.h b/src/backends/native/meta-render-device-gbm.h index 4c8b0516c..3fe1da448 100644 --- a/src/backends/native/meta-render-device-gbm.h +++ b/src/backends/native/meta-render-device-gbm.h @@ -18,8 +18,7 @@ * */ -#ifndef META_RENDER_DEVICE_GBM_H -#define META_RENDER_DEVICE_GBM_H +#pragma once #include "backends/native/meta-render-device-private.h" @@ -33,5 +32,3 @@ MetaRenderDeviceGbm * meta_render_device_gbm_new (MetaBackend *backend, GError **error); struct gbm_device * meta_render_device_gbm_get_gbm_device (MetaRenderDeviceGbm *render_device_gbm); - -#endif /* META_RENDER_DEVICE_GBM_H */ diff --git a/src/backends/native/meta-render-device-private.h b/src/backends/native/meta-render-device-private.h index 564be4fae..eabb06f22 100644 --- a/src/backends/native/meta-render-device-private.h +++ b/src/backends/native/meta-render-device-private.h @@ -18,8 +18,7 @@ * */ -#ifndef META_RENDER_DEVICE_PRIVATE_H -#define META_RENDER_DEVICE_PRIVATE_H +#pragma once #include #include @@ -46,5 +45,3 @@ struct _MetaRenderDeviceClass MetaDrmBuffer *buffer, GError **error); }; - -#endif /* META_RENDER_DEVICE_PRIVATE_H */ diff --git a/src/backends/native/meta-render-device-surfaceless.h b/src/backends/native/meta-render-device-surfaceless.h index b85fc6eeb..809952912 100644 --- a/src/backends/native/meta-render-device-surfaceless.h +++ b/src/backends/native/meta-render-device-surfaceless.h @@ -18,8 +18,7 @@ * */ -#ifndef META_RENDER_DEVICE_SURFACELESS_H -#define META_RENDER_DEVICE_SURFACELESS_H +#pragma once #include "backends/native/meta-render-device-private.h" @@ -31,4 +30,3 @@ G_DECLARE_FINAL_TYPE (MetaRenderDeviceSurfaceless, meta_render_device_surfaceles MetaRenderDeviceSurfaceless * meta_render_device_surfaceless_new (MetaBackend *backend, GError **error); -#endif /* META_RENDER_DEVICE_SURFACELESS_H */ diff --git a/src/backends/native/meta-render-device.h b/src/backends/native/meta-render-device.h index 466681353..47b462e1d 100644 --- a/src/backends/native/meta-render-device.h +++ b/src/backends/native/meta-render-device.h @@ -18,8 +18,7 @@ * */ -#ifndef META_RENDER_DEVICE_H -#define META_RENDER_DEVICE_H +#pragma once #include @@ -57,5 +56,3 @@ MetaDrmBuffer * meta_render_device_allocate_dumb_buf (MetaRenderDevice *render_ int height, uint32_t format, GError **error); - -#endif /* META_RENDER_DEVICE_H */ diff --git a/src/backends/native/meta-renderer-native-gles3.h b/src/backends/native/meta-renderer-native-gles3.h index 4e7324c8d..dc3da33d4 100644 --- a/src/backends/native/meta-renderer-native-gles3.h +++ b/src/backends/native/meta-renderer-native-gles3.h @@ -21,8 +21,7 @@ * */ -#ifndef META_RENDERER_NATIVE_GLES3_H -#define META_RENDERER_NATIVE_GLES3_H +#pragma once #include @@ -36,5 +35,3 @@ gboolean meta_renderer_native_gles3_blit_shared_bo (MetaEgl *egl, EGLSurface egl_surface, struct gbm_bo *shared_bo, GError **error); - -#endif /* META_RENDERER_NATIVE_GLES3_H */ diff --git a/src/backends/native/meta-renderer-native-private.h b/src/backends/native/meta-renderer-native-private.h index 19d06e82d..3633e3237 100644 --- a/src/backends/native/meta-renderer-native-private.h +++ b/src/backends/native/meta-renderer-native-private.h @@ -25,8 +25,7 @@ * */ -#ifndef META_RENDERER_NATIVE_PRIVATE_H -#define META_RENDERER_NATIVE_PRIVATE_H +#pragma once #include "backends/meta-gles3.h" #include "backends/native/meta-backend-native-types.h" @@ -106,5 +105,3 @@ gboolean meta_renderer_native_pop_pending_mode_set (MetaRendererNative *renderer MetaRendererView *view); const CoglWinsysVtable * meta_get_renderer_native_parent_vtable (void); - -#endif /* META_RENDERER_NATIVE_PRIVATE_H */ diff --git a/src/backends/native/meta-renderer-native.h b/src/backends/native/meta-renderer-native.h index 3af3666cc..a0f0da36c 100644 --- a/src/backends/native/meta-renderer-native.h +++ b/src/backends/native/meta-renderer-native.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_RENDERER_NATIVE_H -#define META_RENDERER_NATIVE_H +#pragma once #include #include @@ -76,5 +75,3 @@ gboolean meta_renderer_native_send_modifiers (MetaRendererNative *renderer_nativ gboolean meta_renderer_native_use_modifiers (MetaRendererNative *renderer_native); MetaRendererNativeMode meta_renderer_native_get_mode (MetaRendererNative *renderer_native); - -#endif /* META_RENDERER_NATIVE_H */ diff --git a/src/backends/native/meta-renderer-view-native.h b/src/backends/native/meta-renderer-view-native.h index 34c37939c..363ff1149 100644 --- a/src/backends/native/meta-renderer-view-native.h +++ b/src/backends/native/meta-renderer-view-native.h @@ -22,13 +22,10 @@ * Dor Askayo */ -#ifndef META_RENDERER_VIEW_NATIVE_H -#define META_RENDERER_VIEW_NATIVE_H +#pragma once #include "backends/meta-renderer-view.h" #define META_TYPE_RENDERER_VIEW_NATIVE (meta_renderer_view_native_get_type ()) G_DECLARE_FINAL_TYPE (MetaRendererViewNative, meta_renderer_view_native, META, RENDERER_VIEW_NATIVE, MetaRendererView) - -#endif /* META_RENDERER_VIEW_NATIVE_H */ diff --git a/src/backends/native/meta-seat-impl.h b/src/backends/native/meta-seat-impl.h index bfda20a39..4f48a0c41 100644 --- a/src/backends/native/meta-seat-impl.h +++ b/src/backends/native/meta-seat-impl.h @@ -20,8 +20,7 @@ * Author: Jonas Ådahl */ -#ifndef META_SEAT_IMPL_H -#define META_SEAT_IMPL_H +#pragma once #ifndef META_INPUT_THREAD_H_INSIDE #error "This header cannot be included directly. Use "backends/native/meta-input-thread.h"" @@ -258,5 +257,3 @@ void meta_seat_impl_queue_main_thread_idle (MetaSeatImpl *seat_impl, GDestroyNotify destroy_notify); MetaBackend * meta_seat_impl_get_backend (MetaSeatImpl *seat_impl); - -#endif /* META_SEAT_IMPL_H */ diff --git a/src/backends/native/meta-seat-native.h b/src/backends/native/meta-seat-native.h index d16a3c4f3..b85cef66c 100644 --- a/src/backends/native/meta-seat-native.h +++ b/src/backends/native/meta-seat-native.h @@ -20,8 +20,7 @@ * Author: Jonas Ådahl */ -#ifndef META_SEAT_NATIVE_H -#define META_SEAT_NATIVE_H +#pragma once #include #include @@ -137,5 +136,3 @@ void meta_seat_native_run_impl_task (MetaSeatNative *seat, GSourceFunc dispatch_func, gpointer user_data, GDestroyNotify destroy_notify); - -#endif /* META_SEAT_NATIVE_H */ diff --git a/src/backends/native/meta-stage-native.h b/src/backends/native/meta-stage-native.h index 5f33e1f9a..c7cc03675 100644 --- a/src/backends/native/meta-stage-native.h +++ b/src/backends/native/meta-stage-native.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_STAGE_NATIVE_H -#define META_STAGE_NATIVE_H +#pragma once #include "backends/meta-stage-impl-private.h" #include "clutter/clutter-mutter.h" @@ -33,5 +32,3 @@ G_DECLARE_FINAL_TYPE (MetaStageNative, meta_stage_native, META, STAGE_NATIVE, MetaStageImpl) void meta_stage_native_rebuild_views (MetaStageNative *stage_native); - -#endif /* META_STAGE_NATIVE_H */ diff --git a/src/backends/native/meta-thread-impl.h b/src/backends/native/meta-thread-impl.h index 4d36949eb..f5ca9d76e 100644 --- a/src/backends/native/meta-thread-impl.h +++ b/src/backends/native/meta-thread-impl.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_THREAD_IMPL_H -#define META_THREAD_IMPL_H +#pragma once #include @@ -91,5 +90,3 @@ MetaThreadTask * meta_thread_task_new (MetaThreadTaskFunc func, GMainContext *feedback_main_context); void meta_thread_task_free (MetaThreadTask *task); - -#endif /* META_THREAD_IMPL_H */ diff --git a/src/backends/native/meta-thread-private.h b/src/backends/native/meta-thread-private.h index 4b120c928..89dc86248 100644 --- a/src/backends/native/meta-thread-private.h +++ b/src/backends/native/meta-thread-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_THREAD_PRIVATE_H -#define META_THREAD_PRIVATE_H +#pragma once #include "backends/native/meta-thread.h" @@ -35,5 +34,3 @@ GThread * meta_thread_get_thread (MetaThread *thread); void meta_thread_dispatch_callbacks (MetaThread *thread, GMainContext *main_context); - -#endif /* META_THREAD_PRIVATE_H */ diff --git a/src/backends/native/meta-thread.h b/src/backends/native/meta-thread.h index d1886171d..fe14cc12b 100644 --- a/src/backends/native/meta-thread.h +++ b/src/backends/native/meta-thread.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_THREAD_H -#define META_THREAD_H +#pragma once #include @@ -107,5 +106,3 @@ gboolean meta_thread_is_waiting_for_impl_task (MetaThread *thread); g_assert (!meta_thread_is_in_impl_task (thread)) #define meta_assert_is_waiting_for_thread_impl_task(thread) \ g_assert (meta_thread_is_waiting_for_impl_task (thread)) - -#endif /* META_THREAD_H */ diff --git a/src/backends/native/meta-udev.h b/src/backends/native/meta-udev.h index 6b3e7552f..3283fda8e 100644 --- a/src/backends/native/meta-udev.h +++ b/src/backends/native/meta-udev.h @@ -18,8 +18,7 @@ * */ -#ifndef META_UDEV_H -#define META_UDEV_H +#pragma once #include @@ -53,5 +52,3 @@ void meta_udev_pause (MetaUdev *udev); void meta_udev_resume (MetaUdev *udev); MetaUdev * meta_udev_new (MetaBackendNative *backend_native); - -#endif /* META_UDEV_H */ diff --git a/src/backends/native/meta-virtual-input-device-native.h b/src/backends/native/meta-virtual-input-device-native.h index 28d218abb..a41b5ed29 100644 --- a/src/backends/native/meta-virtual-input-device-native.h +++ b/src/backends/native/meta-virtual-input-device-native.h @@ -17,8 +17,7 @@ * Author: Jonas Ådahl */ -#ifndef META_VIRTUAL_INPUT_DEVICE_NATIVE_H -#define META_VIRTUAL_INPUT_DEVICE_NATIVE_H +#pragma once #include "clutter/clutter-virtual-input-device.h" @@ -27,5 +26,3 @@ G_DECLARE_FINAL_TYPE (MetaVirtualInputDeviceNative, meta_virtual_input_device_native, META, VIRTUAL_INPUT_DEVICE_NATIVE, ClutterVirtualInputDevice) - -#endif /* META_VIRTUAL_INPUT_DEVICE_NATIVE_H */ diff --git a/src/backends/native/meta-virtual-monitor-native.h b/src/backends/native/meta-virtual-monitor-native.h index d413b3d8b..7ee7d209f 100644 --- a/src/backends/native/meta-virtual-monitor-native.h +++ b/src/backends/native/meta-virtual-monitor-native.h @@ -18,8 +18,7 @@ * */ -#ifndef META_VIRTUAL_MONITOR_NATIVE_H -#define META_VIRTUAL_MONITOR_NATIVE_H +#pragma once #include @@ -42,5 +41,3 @@ MetaOutput * meta_virtual_monitor_native_get_output (MetaVirtualMonitorNative *v MetaVirtualMonitorNative * meta_virtual_monitor_native_new (MetaBackend *backend, uint64_t id, const MetaVirtualMonitorInfo *info); - -#endif /* META_VIRTUAL_MONITOR_NATIVE_H */ diff --git a/src/backends/native/meta-xkb-utils.h b/src/backends/native/meta-xkb-utils.h index d605813e6..ada1f62ff 100644 --- a/src/backends/native/meta-xkb-utils.h +++ b/src/backends/native/meta-xkb-utils.h @@ -18,8 +18,7 @@ * Damien Lespiau */ -#ifndef META_XKB_UTILS_H -#define META_XKB_UTILS_H +#pragma once #include @@ -39,5 +38,3 @@ ClutterModifierType meta_xkb_translate_modifiers (struct xkb_state *state, ClutterModifierType button_state); uint32_t meta_xkb_keycode_to_evdev (uint32_t hardware_keycode); uint32_t meta_xkb_evdev_to_keycode (uint32_t evcode); - -#endif /* META_XKB_UTILS_H */ diff --git a/src/backends/x11/cm/meta-backend-x11-cm.h b/src/backends/x11/cm/meta-backend-x11-cm.h index 5332da13d..fe4c9f13e 100644 --- a/src/backends/x11/cm/meta-backend-x11-cm.h +++ b/src/backends/x11/cm/meta-backend-x11-cm.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_BACKEND_X11_CM_H -#define META_BACKEND_X11_CM_H +#pragma once #include @@ -27,5 +26,3 @@ #define META_TYPE_BACKEND_X11_CM (meta_backend_x11_cm_get_type ()) G_DECLARE_FINAL_TYPE (MetaBackendX11Cm, meta_backend_x11_cm, META, BACKEND_X11_CM, MetaBackendX11) - -#endif /* META_BACKEND_X11_CM_H */ diff --git a/src/backends/x11/cm/meta-cursor-sprite-xfixes.h b/src/backends/x11/cm/meta-cursor-sprite-xfixes.h index 469d958a2..4a4cd72f8 100644 --- a/src/backends/x11/cm/meta-cursor-sprite-xfixes.h +++ b/src/backends/x11/cm/meta-cursor-sprite-xfixes.h @@ -16,8 +16,7 @@ * */ -#ifndef META_CURSOR_SPRITE_XFIXES_H -#define META_CURSOR_SPRITE_XFIXES_H +#pragma once #include @@ -33,5 +32,3 @@ G_DECLARE_FINAL_TYPE (MetaCursorSpriteXfixes, MetaCursorSpriteXfixes * meta_cursor_sprite_xfixes_new (MetaDisplay *display, MetaCursorTracker *cursor_tracker, GError **error); - -#endif /* META_CURSOR_SPRITE_XFIXES_H */ diff --git a/src/backends/x11/cm/meta-renderer-x11-cm.h b/src/backends/x11/cm/meta-renderer-x11-cm.h index 7ddb3445d..fd25248ad 100644 --- a/src/backends/x11/cm/meta-renderer-x11-cm.h +++ b/src/backends/x11/cm/meta-renderer-x11-cm.h @@ -20,8 +20,7 @@ * */ -#ifndef META_RENDERER_X11_CM_H -#define META_RENDERER_X11_CM_H +#pragma once #include "backends/x11/meta-renderer-x11.h" @@ -38,5 +37,3 @@ void meta_renderer_x11_cm_init_screen_view (MetaRendererX11Cm *renderer_x11_cm, void meta_renderer_x11_cm_resize (MetaRendererX11Cm *renderer_x11_cm, int width, int height); - -#endif /* META_RENDERER_X11_CM_H */ diff --git a/src/backends/x11/meta-backend-x11-types.h b/src/backends/x11/meta-backend-x11-types.h index 86818efbf..5a8b08d41 100644 --- a/src/backends/x11/meta-backend-x11-types.h +++ b/src/backends/x11/meta-backend-x11-types.h @@ -18,11 +18,7 @@ * */ -#ifndef META_BACKEND_X11_TYPES_H -#define META_BACKEND_X11_TYPES_H - +#pragma once typedef struct _MetaBackendX11 MetaBackendX11; typedef struct _MetaX11Barriers MetaX11Barriers; - -#endif /* META_BACKEND_X11_TYPES_H */ diff --git a/src/backends/x11/meta-backend-x11.h b/src/backends/x11/meta-backend-x11.h index 748ab3c11..a4480777d 100644 --- a/src/backends/x11/meta-backend-x11.h +++ b/src/backends/x11/meta-backend-x11.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef META_BACKEND_X11_H -#define META_BACKEND_X11_H +#pragma once #include #include @@ -66,5 +65,3 @@ void meta_backend_x11_reload_cursor (MetaBackendX11 *x11); void meta_backend_x11_sync_pointer (MetaBackendX11 *backend_x11); MetaX11Barriers * meta_backend_x11_get_barriers (MetaBackendX11 *backend_x11); - -#endif /* META_BACKEND_X11_H */ diff --git a/src/backends/x11/meta-barrier-x11.h b/src/backends/x11/meta-barrier-x11.h index ae50fdcca..0150856c1 100644 --- a/src/backends/x11/meta-barrier-x11.h +++ b/src/backends/x11/meta-barrier-x11.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_BARRIER_X11_H -#define META_BARRIER_X11_H +#pragma once #include "backends/meta-barrier-private.h" #include "backends/x11/meta-backend-x11-types.h" @@ -46,5 +45,3 @@ gboolean meta_x11_barriers_process_xevent (MetaX11Barriers *barriers, XIEvent *event); G_END_DECLS - -#endif /* META_BARRIER_X11_H1 */ diff --git a/src/backends/x11/meta-clutter-backend-x11.h b/src/backends/x11/meta-clutter-backend-x11.h index 187db4b9a..ba101ff43 100644 --- a/src/backends/x11/meta-clutter-backend-x11.h +++ b/src/backends/x11/meta-clutter-backend-x11.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_CLUTTER_BACKEND_X11_H -#define META_CLUTTER_BACKEND_X11_H +#pragma once #include @@ -87,5 +86,3 @@ void meta_clutter_backend_x11_remove_filter (MetaClutterBackendX11 *clutter_back void meta_clutter_x11_set_use_stereo_stage (gboolean use_stereo); gboolean meta_clutter_x11_get_use_stereo_stage (void); - -#endif /* META_CLUTTER_BACKEND_X11_H */ diff --git a/src/backends/x11/meta-color-manager-x11.h b/src/backends/x11/meta-color-manager-x11.h index cb178c0bc..a0b911dbb 100644 --- a/src/backends/x11/meta-color-manager-x11.h +++ b/src/backends/x11/meta-color-manager-x11.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_COLOR_MANAGER_X11_H -#define META_COLOR_MANAGER_X11_H +#pragma once #include @@ -26,5 +25,3 @@ G_DECLARE_FINAL_TYPE (MetaColorManagerX11, meta_color_manager_x11, META, COLOR_MANAGER_X11, MetaColorManager) - -#endif /* META_COLOR_MANAGER_X11_H */ diff --git a/src/backends/x11/meta-crtc-xrandr.h b/src/backends/x11/meta-crtc-xrandr.h index dbf5da0c6..3cd750cae 100644 --- a/src/backends/x11/meta-crtc-xrandr.h +++ b/src/backends/x11/meta-crtc-xrandr.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_CRTC_XRANDR_H -#define META_CRTC_XRANDR_H +#pragma once #include #include @@ -53,5 +52,3 @@ MetaCrtcXrandr * meta_crtc_xrandr_new (MetaGpuXrandr *gpu_xrandr, XRRCrtcInfo *xrandr_crtc, RRCrtc crtc_id, XRRScreenResources *resources); - -#endif /* META_CRTC_XRANDR_H */ diff --git a/src/backends/x11/meta-cursor-renderer-x11.h b/src/backends/x11/meta-cursor-renderer-x11.h index b52834375..ba39549ca 100644 --- a/src/backends/x11/meta-cursor-renderer-x11.h +++ b/src/backends/x11/meta-cursor-renderer-x11.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef META_CURSOR_RENDERER_X11_H -#define META_CURSOR_RENDERER_X11_H +#pragma once #include "backends/meta-cursor-renderer.h" @@ -48,5 +47,3 @@ struct _MetaCursorRendererX11Class }; GType meta_cursor_renderer_x11_get_type (void) G_GNUC_CONST; - -#endif /* META_CURSOR_RENDERER_X11_H */ diff --git a/src/backends/x11/meta-cursor-tracker-x11.h b/src/backends/x11/meta-cursor-tracker-x11.h index a4b462844..17e3e7a8b 100644 --- a/src/backends/x11/meta-cursor-tracker-x11.h +++ b/src/backends/x11/meta-cursor-tracker-x11.h @@ -18,8 +18,7 @@ * */ -#ifndef META_CURSOR_TRACKER_X11_H -#define META_CURSOR_TRACKER_X11_H +#pragma once #include "backends/meta-cursor-tracker-private.h" @@ -30,5 +29,3 @@ G_DECLARE_FINAL_TYPE (MetaCursorTrackerX11, meta_cursor_tracker_x11, gboolean meta_cursor_tracker_x11_handle_xevent (MetaCursorTrackerX11 *tracker_x11, XEvent *xevent); - -#endif /* META_CURSOR_TRACKER_X11_H */ diff --git a/src/backends/x11/meta-event-x11.h b/src/backends/x11/meta-event-x11.h index f54c186a8..3dfc18b3d 100644 --- a/src/backends/x11/meta-event-x11.h +++ b/src/backends/x11/meta-event-x11.h @@ -21,8 +21,7 @@ * Emmanuele Bassi */ -#ifndef META_EVENT_X11_H -#define META_EVENT_X11_H +#pragma once #include @@ -30,5 +29,3 @@ MetaX11FilterReturn meta_x11_handle_event (MetaBackend *backend, XEvent *xevent); - -#endif /* META_EVENT_X11_H */ diff --git a/src/backends/x11/meta-gpu-xrandr.h b/src/backends/x11/meta-gpu-xrandr.h index 2086f8632..1530c5baf 100644 --- a/src/backends/x11/meta-gpu-xrandr.h +++ b/src/backends/x11/meta-gpu-xrandr.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_GPU_XRANDR_H -#define META_GPU_XRANDR_H +#pragma once #include #include @@ -38,5 +37,3 @@ void meta_gpu_xrandr_get_max_screen_size (MetaGpuXrandr *gpu_xrandr, int *max_height); MetaGpuXrandr * meta_gpu_xrandr_new (MetaBackendX11 *backend_x11); - -#endif /* META_GPU_XRANDR_H */ diff --git a/src/backends/x11/meta-input-device-tool-x11.h b/src/backends/x11/meta-input-device-tool-x11.h index e52803da9..ac1cf7b92 100644 --- a/src/backends/x11/meta-input-device-tool-x11.h +++ b/src/backends/x11/meta-input-device-tool-x11.h @@ -17,8 +17,7 @@ * Author: Carlos Garnacho */ -#ifndef META_INPUT_DEVICE_TOOL_X11_H -#define META_INPUT_DEVICE_TOOL_X11_H +#pragma once #include "clutter/clutter.h" @@ -47,5 +46,3 @@ GType meta_input_device_tool_x11_get_type (void) G_GNUC_CONST; ClutterInputDeviceTool * meta_input_device_tool_x11_new (guint serial, ClutterInputDeviceToolType type); - -#endif /* META_INPUT_DEVICE_TOOL_X11_H */ diff --git a/src/backends/x11/meta-input-device-x11.h b/src/backends/x11/meta-input-device-x11.h index 66e03f581..1ea85aa14 100644 --- a/src/backends/x11/meta-input-device-x11.h +++ b/src/backends/x11/meta-input-device-x11.h @@ -17,8 +17,7 @@ * Author: Emmanuele Bassi */ -#ifndef META_INPUT_DEVICE_X11_H -#define META_INPUT_DEVICE_X11_H +#pragma once #include @@ -98,5 +97,3 @@ gboolean meta_input_device_x11_get_scroll_delta (ClutterInputDevice *device, void meta_input_device_x11_reset_scroll_info (ClutterInputDevice *device); G_END_DECLS - -#endif /* META_INPUT_DEVICE_X11_H */ diff --git a/src/backends/x11/meta-input-settings-x11.h b/src/backends/x11/meta-input-settings-x11.h index 2780bb224..279ae9037 100644 --- a/src/backends/x11/meta-input-settings-x11.h +++ b/src/backends/x11/meta-input-settings-x11.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_INPUT_SETTINGS_X11_H -#define META_INPUT_SETTINGS_X11_H +#pragma once #include "backends/meta-input-settings-private.h" @@ -45,5 +44,3 @@ struct _MetaInputSettingsX11Class }; GType meta_input_settings_x11_get_type (void) G_GNUC_CONST; - -#endif /* META_INPUT_SETTINGS_X11_H */ diff --git a/src/backends/x11/meta-keymap-x11.h b/src/backends/x11/meta-keymap-x11.h index 2f93acdbc..257bd247c 100644 --- a/src/backends/x11/meta-keymap-x11.h +++ b/src/backends/x11/meta-keymap-x11.h @@ -17,8 +17,7 @@ * Author: Emmanuele Bassi */ -#ifndef META_KEYMAP_X11_H -#define META_KEYMAP_X11_H +#pragma once #include #include @@ -57,5 +56,3 @@ gboolean meta_keymap_x11_handle_event (MetaKeymapX11 *keymap_x11, XEvent *xevent); G_END_DECLS - -#endif /* META_KEYMAP_X11_H */ diff --git a/src/backends/x11/meta-monitor-manager-xrandr.h b/src/backends/x11/meta-monitor-manager-xrandr.h index d55b3d2b8..f2d25bdff 100644 --- a/src/backends/x11/meta-monitor-manager-xrandr.h +++ b/src/backends/x11/meta-monitor-manager-xrandr.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_MONITOR_MANAGER_XRANDR_H -#define META_MONITOR_MANAGER_XRANDR_H +#pragma once #include @@ -37,5 +36,3 @@ gboolean meta_monitor_manager_xrandr_has_randr15 (MetaMonitorManagerXrandr *mana gboolean meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager, XEvent *event); - -#endif /* META_MONITOR_MANAGER_XRANDR_H */ diff --git a/src/backends/x11/meta-output-xrandr.h b/src/backends/x11/meta-output-xrandr.h index ec5104f30..b358304b1 100644 --- a/src/backends/x11/meta-output-xrandr.h +++ b/src/backends/x11/meta-output-xrandr.h @@ -20,8 +20,7 @@ * 02111-1307, USA. */ -#ifndef META_OUTPUT_XRANDR_H -#define META_OUTPUT_XRANDR_H +#pragma once #include @@ -48,5 +47,3 @@ MetaOutputXrandr * meta_output_xrandr_new (MetaGpuXrandr *gpu_xrandr, XRROutputInfo *xrandr_output, RROutput output_id, RROutput primary_output); - -#endif /* META_OUTPUT_XRANDR_H */ diff --git a/src/backends/x11/meta-renderer-x11.h b/src/backends/x11/meta-renderer-x11.h index 5ec0d4bc4..82b240b5e 100644 --- a/src/backends/x11/meta-renderer-x11.h +++ b/src/backends/x11/meta-renderer-x11.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_RENDERER_X11_H -#define META_RENDERER_X11_H +#pragma once #include @@ -38,5 +37,3 @@ struct _MetaRendererX11Class G_DECLARE_DERIVABLE_TYPE (MetaRendererX11, meta_renderer_x11, META, RENDERER_X11, MetaRenderer) - -#endif /* META_RENDERER_X11_H */ diff --git a/src/backends/x11/meta-seat-x11.h b/src/backends/x11/meta-seat-x11.h index 365a12528..99e830adc 100644 --- a/src/backends/x11/meta-seat-x11.h +++ b/src/backends/x11/meta-seat-x11.h @@ -16,8 +16,8 @@ * * Author: Carlos Garnacho */ -#ifndef META_SEAT_X11_H -#define META_SEAT_X11_H + +#pragma once #include "clutter/clutter.h" @@ -44,5 +44,3 @@ void meta_seat_x11_notify_devices (MetaSeatX11 *seat_x11, ClutterStage *stage); G_END_DECLS - -#endif /* META_SEAT_X11_H */ diff --git a/src/backends/x11/meta-stage-x11.h b/src/backends/x11/meta-stage-x11.h index 60f38bfaf..df4e091d8 100644 --- a/src/backends/x11/meta-stage-x11.h +++ b/src/backends/x11/meta-stage-x11.h @@ -19,8 +19,7 @@ * */ -#ifndef META_STAGE_X11_H -#define META_STAGE_X11_H +#pragma once #include #include @@ -90,5 +89,3 @@ Window meta_x11_get_stage_window (ClutterStage *stage); G_END_DECLS - -#endif /* META_STAGE_H */ diff --git a/src/backends/x11/meta-virtual-input-device-x11.h b/src/backends/x11/meta-virtual-input-device-x11.h index 88c41ae8d..54ea9355e 100644 --- a/src/backends/x11/meta-virtual-input-device-x11.h +++ b/src/backends/x11/meta-virtual-input-device-x11.h @@ -17,8 +17,7 @@ * Author: Jonas Ådahl */ -#ifndef META_VIRTUAL_INPUT_DEVICE_X11_H -#define META_VIRTUAL_INPUT_DEVICE_X11_H +#pragma once #include "clutter/clutter.h" @@ -27,5 +26,3 @@ G_DECLARE_FINAL_TYPE (MetaVirtualInputDeviceX11, meta_virtual_input_device_x11, META, VIRTUAL_INPUT_DEVICE_X11, ClutterVirtualInputDevice) - -#endif /* META_VIRTUAL_INPUT_DEVICE_X11_H */ diff --git a/src/backends/x11/meta-xkb-a11y-x11.h b/src/backends/x11/meta-xkb-a11y-x11.h index 58a4e1766..cf9a79091 100644 --- a/src/backends/x11/meta-xkb-a11y-x11.h +++ b/src/backends/x11/meta-xkb-a11y-x11.h @@ -21,8 +21,7 @@ * */ -#ifndef META_XKB_A11Y_X11_H -#define META_XKB_A11Y_X11_H +#pragma once #include @@ -35,5 +34,3 @@ meta_seat_x11_apply_kbd_a11y_settings (ClutterSeat *seat, gboolean meta_seat_x11_a11y_init (ClutterSeat *seat); - -#endif /* META_XKB_A11Y_X11_H */ diff --git a/src/backends/x11/nested/meta-backend-x11-nested.h b/src/backends/x11/nested/meta-backend-x11-nested.h index 4f19ff54a..aaccf6778 100644 --- a/src/backends/x11/nested/meta-backend-x11-nested.h +++ b/src/backends/x11/nested/meta-backend-x11-nested.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_BACKEND_X11_NESTED_H -#define META_BACKEND_X11_NESTED_H +#pragma once #include @@ -36,5 +35,3 @@ struct _MetaBackendX11NestedClass void (* init_gpus) (MetaBackendX11Nested *backend_x11_nested); }; - -#endif /* META_BACKEND_X11_NESTED_H */ diff --git a/src/backends/x11/nested/meta-cursor-renderer-x11-nested.h b/src/backends/x11/nested/meta-cursor-renderer-x11-nested.h index 32f816629..f4221e22b 100644 --- a/src/backends/x11/nested/meta-cursor-renderer-x11-nested.h +++ b/src/backends/x11/nested/meta-cursor-renderer-x11-nested.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_CURSOR_RENDERER_X11_NESTED_NESTED_H -#define META_CURSOR_RENDERER_X11_NESTED_NESTED_H +#pragma once #include @@ -34,5 +33,3 @@ G_DECLARE_FINAL_TYPE (MetaCursorRendererX11Nested, meta_cursor_renderer_x11_nested, META, CURSOR_RENDERER_X11_NESTED, MetaCursorRenderer); - -#endif /* META_CURSOR_RENDERER_X11_NESTED_NESTED_H */ diff --git a/src/backends/x11/nested/meta-renderer-x11-nested.h b/src/backends/x11/nested/meta-renderer-x11-nested.h index 9fc88e85b..5ea6ceb3d 100644 --- a/src/backends/x11/nested/meta-renderer-x11-nested.h +++ b/src/backends/x11/nested/meta-renderer-x11-nested.h @@ -20,8 +20,7 @@ * */ -#ifndef META_RENDERER_X11_NESTED_H -#define META_RENDERER_X11_NESTED_H +#pragma once #include "backends/x11/meta-renderer-x11.h" @@ -33,5 +32,3 @@ G_DECLARE_FINAL_TYPE (MetaRendererX11Nested, meta_renderer_x11_nested, void meta_renderer_x11_nested_ensure_legacy_view (MetaRendererX11Nested *renderer_x11_nested, int width, int height); - -#endif /* META_RENDERER_X11_NESTED_H */ diff --git a/src/backends/x11/nested/meta-stage-x11-nested.h b/src/backends/x11/nested/meta-stage-x11-nested.h index 76678465b..64dd2719f 100644 --- a/src/backends/x11/nested/meta-stage-x11-nested.h +++ b/src/backends/x11/nested/meta-stage-x11-nested.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_STAGE_X11_NESTED_H -#define META_STAGE_X11_NESTED_H +#pragma once #include "clutter/clutter-mutter.h" #include "backends/x11/meta-stage-x11.h" @@ -31,5 +30,3 @@ #define META_TYPE_STAGE_X11_NESTED (meta_stage_x11_nested_get_type ()) G_DECLARE_FINAL_TYPE (MetaStageX11Nested, meta_stage_x11_nested, META, STAGE_X11_NESTED, MetaStageX11) - -#endif /* META_STAGE_X11_NESTED_H */ diff --git a/src/common/meta-cogl-drm-formats.h b/src/common/meta-cogl-drm-formats.h index 79a78a4df..7cf32644f 100644 --- a/src/common/meta-cogl-drm-formats.h +++ b/src/common/meta-cogl-drm-formats.h @@ -22,8 +22,7 @@ * */ -#ifndef META_COGL_DRM_FORMATS_H -#define META_COGL_DRM_FORMATS_H +#pragma once #include @@ -83,5 +82,3 @@ gboolean meta_cogl_pixel_format_from_drm_format (uint32_t drm_for MetaMultiTextureFormat *out_multi_texture_format); G_END_DECLS - -#endif /* META_COGL_DRM_FORMATS_H */ diff --git a/src/compositor/clutter-utils.h b/src/compositor/clutter-utils.h index 921551aaf..58bf67dc6 100644 --- a/src/compositor/clutter-utils.h +++ b/src/compositor/clutter-utils.h @@ -18,8 +18,7 @@ * along with this program; if not, see . */ -#ifndef __META_CLUTTER_UTILS_H__ -#define __META_CLUTTER_UTILS_H__ +#pragma once #include "clutter/clutter.h" @@ -39,5 +38,3 @@ gboolean meta_actor_painting_untransformed (CoglFramebuffer *fb, int sample_widthf, int sample_heightf, MetaTransforms *out_transforms); - -#endif /* __META_CLUTTER_UTILS_H__ */ diff --git a/src/compositor/cogl-utils.h b/src/compositor/cogl-utils.h index ae7e85176..0ea4e5d6c 100644 --- a/src/compositor/cogl-utils.h +++ b/src/compositor/cogl-utils.h @@ -18,8 +18,7 @@ * along with this program; if not, see . */ -#ifndef __META_COGL_UTILS_H__ -#define __META_COGL_UTILS_H__ +#pragma once #include "cogl/cogl.h" @@ -36,4 +35,3 @@ CoglTexture *meta_create_texture (int width, CoglTextureComponents components, MetaTextureFlags flags); -#endif /* __META_COGL_UTILS_H__ */ diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h index 0e6dee00e..df22082d6 100644 --- a/src/compositor/compositor-private.h +++ b/src/compositor/compositor-private.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef META_COMPOSITOR_PRIVATE_H -#define META_COMPOSITOR_PRIVATE_H +#pragma once #include @@ -182,5 +181,3 @@ meta_translate_to_high_res_xserver_time (int64_t time_us) return ms2us (ms & 0xffffffff) + us; } - -#endif /* META_COMPOSITOR_PRIVATE_H */ diff --git a/src/compositor/edge-resistance.h b/src/compositor/edge-resistance.h index 20ce62562..ed954facf 100644 --- a/src/compositor/edge-resistance.h +++ b/src/compositor/edge-resistance.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_EDGE_RESISTANCE_H -#define META_EDGE_RESISTANCE_H +#pragma once #include "core/window-private.h" @@ -38,6 +37,3 @@ void meta_window_drag_edge_resistance_for_resize (MetaWindowDrag *windo int *new_height, MetaGravity gravity, MetaEdgeResistanceFlags flags); - -#endif /* META_EDGE_RESISTANCE_H */ - diff --git a/src/compositor/meta-background-actor-private.h b/src/compositor/meta-background-actor-private.h index bdf8c4744..f74dd98cc 100644 --- a/src/compositor/meta-background-actor-private.h +++ b/src/compositor/meta-background-actor-private.h @@ -1,10 +1,7 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef META_BACKGROUND_ACTOR_PRIVATE_H -#define META_BACKGROUND_ACTOR_PRIVATE_H +#pragma once #include "meta/meta-background-actor.h" cairo_region_t *meta_background_actor_get_clip_region (MetaBackgroundActor *self); - -#endif /* META_BACKGROUND_ACTOR_PRIVATE_H */ diff --git a/src/compositor/meta-background-content-private.h b/src/compositor/meta-background-content-private.h index 284cddb3a..4d554d0df 100644 --- a/src/compositor/meta-background-content-private.h +++ b/src/compositor/meta-background-content-private.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef META_BACKGROUND_CONTENT_PRIVATE_H -#define META_BACKGROUND_CONTENT_PRIVATE_H +#pragma once #include "meta/meta-background-content.h" @@ -12,5 +11,3 @@ void meta_background_content_cull_out (MetaBackgroundContent *self, cairo_region_t *clip_region); void meta_background_content_reset_culling (MetaBackgroundContent *self); - -#endif /* META_BACKGROUND_CONTENT_PRIVATE_H */ diff --git a/src/compositor/meta-background-private.h b/src/compositor/meta-background-private.h index 871487da4..0ba655fa3 100644 --- a/src/compositor/meta-background-private.h +++ b/src/compositor/meta-background-private.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef META_BACKGROUND_PRIVATE_H -#define META_BACKGROUND_PRIVATE_H +#pragma once #include "cogl/cogl.h" #include "meta/meta-background.h" @@ -10,5 +9,3 @@ CoglTexture *meta_background_get_texture (MetaBackground *self, int monitor_index, cairo_rectangle_int_t *texture_area, CoglPipelineWrapMode *wrap_mode); - -#endif /* META_BACKGROUND_PRIVATE_H */ diff --git a/src/compositor/meta-compositor-native.h b/src/compositor/meta-compositor-native.h index 2b1c65208..cb73fcb85 100644 --- a/src/compositor/meta-compositor-native.h +++ b/src/compositor/meta-compositor-native.h @@ -18,8 +18,7 @@ * */ -#ifndef META_COMPOSITOR_NATIVE_H -#define META_COMPOSITOR_NATIVE_H +#pragma once #include "compositor/meta-compositor-server.h" @@ -29,5 +28,3 @@ G_DECLARE_FINAL_TYPE (MetaCompositorNative, meta_compositor_native, MetaCompositorNative * meta_compositor_native_new (MetaDisplay *display, MetaBackend *backend); - -#endif /* META_COMPOSITOR_NATIVE_H */ diff --git a/src/compositor/meta-compositor-server.h b/src/compositor/meta-compositor-server.h index 2bf8d5ec3..9829474f5 100644 --- a/src/compositor/meta-compositor-server.h +++ b/src/compositor/meta-compositor-server.h @@ -18,8 +18,7 @@ * */ -#ifndef META_COMPOSITOR_SERVER_H -#define META_COMPOSITOR_SERVER_H +#pragma once #include "compositor/compositor-private.h" @@ -34,5 +33,3 @@ struct _MetaCompositorServerClass MetaCompositorServer * meta_compositor_server_new (MetaDisplay *display, MetaBackend *backend); - -#endif /* META_COMPOSITOR_SERVER_H */ diff --git a/src/compositor/meta-compositor-view-native.h b/src/compositor/meta-compositor-view-native.h index af551854e..3cdac33d2 100644 --- a/src/compositor/meta-compositor-view-native.h +++ b/src/compositor/meta-compositor-view-native.h @@ -22,8 +22,7 @@ * Dor Askayo */ -#ifndef META_COMPOSITOR_VIEW_NATIVE_H -#define META_COMPOSITOR_VIEW_NATIVE_H +#pragma once #include "clutter/clutter-mutter.h" #include "compositor/meta-compositor-view.h" @@ -39,5 +38,3 @@ MetaCompositorViewNative *meta_compositor_view_native_new (ClutterStageView *sta void meta_compositor_view_native_maybe_assign_scanout (MetaCompositorViewNative *view_native, MetaCompositor *compositor); #endif /* HAVE_WAYLAND */ - -#endif /* META_COMPOSITOR_VIEW_NATIVE_H */ diff --git a/src/compositor/meta-compositor-view.h b/src/compositor/meta-compositor-view.h index 7adc41fc1..19ca58ffe 100644 --- a/src/compositor/meta-compositor-view.h +++ b/src/compositor/meta-compositor-view.h @@ -22,8 +22,7 @@ * Dor Askayo */ -#ifndef META_COMPOSITOR_VIEW_H -#define META_COMPOSITOR_VIEW_H +#pragma once #include @@ -47,5 +46,3 @@ void meta_compositor_view_update_top_window_actor (MetaCompositorView *composito MetaWindowActor *meta_compositor_view_get_top_window_actor (MetaCompositorView *compositor_view); ClutterStageView *meta_compositor_view_get_stage_view (MetaCompositorView *compositor_view); - -#endif /* META_COMPOSITOR_VIEW_H */ diff --git a/src/compositor/meta-compositor-x11.h b/src/compositor/meta-compositor-x11.h index 42554feb3..13d7e1aac 100644 --- a/src/compositor/meta-compositor-x11.h +++ b/src/compositor/meta-compositor-x11.h @@ -18,8 +18,7 @@ * */ -#ifndef META_COMPOSITOR_X11_H -#define META_COMPOSITOR_X11_H +#pragma once #include "compositor/compositor-private.h" @@ -35,5 +34,3 @@ void meta_compositor_x11_process_xevent (MetaCompositorX11 *compositor_x11, MetaWindow *window); Window meta_compositor_x11_get_output_xwindow (MetaCompositorX11 *compositor_x11); - -#endif /* META_COMPOSITOR_X11_H */ diff --git a/src/compositor/meta-cullable.h b/src/compositor/meta-cullable.h index 4087bc44e..59fca5919 100644 --- a/src/compositor/meta-cullable.h +++ b/src/compositor/meta-cullable.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef __META_CULLABLE_H__ -#define __META_CULLABLE_H__ +#pragma once #include "clutter/clutter.h" @@ -54,6 +53,3 @@ void meta_cullable_cull_out_children (MetaCullable *cullable, void meta_cullable_reset_culling_children (MetaCullable *cullable); G_END_DECLS - -#endif /* __META_CULLABLE_H__ */ - diff --git a/src/compositor/meta-dnd-actor-private.h b/src/compositor/meta-dnd-actor-private.h index 9f0bb02d1..4ee142d43 100644 --- a/src/compositor/meta-dnd-actor-private.h +++ b/src/compositor/meta-dnd-actor-private.h @@ -20,8 +20,7 @@ * Author: Carlos Garnacho */ -#ifndef META_DND_ACTOR_PRIVATE_H -#define META_DND_ACTOR_PRIVATE_H +#pragma once #include "compositor/meta-feedback-actor-private.h" @@ -45,5 +44,3 @@ ClutterActor *meta_dnd_actor_new (MetaCompositor *compositor, void meta_dnd_actor_drag_finish (MetaDnDActor *self, gboolean success); - -#endif /* META_DND_ACTOR_PRIVATE_H */ diff --git a/src/compositor/meta-dnd-private.h b/src/compositor/meta-dnd-private.h index 925a1f413..c9a1dc4ed 100644 --- a/src/compositor/meta-dnd-private.h +++ b/src/compositor/meta-dnd-private.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_DND_PRIVATE_H -#define META_DND_PRIVATE_H +#pragma once #include "backends/meta-backend-types.h" #include "meta/meta-dnd.h" @@ -24,5 +23,3 @@ MetaDnd * meta_dnd_new (MetaBackend *backend); MetaBackend * meta_dnd_get_backend (MetaDnd *dnd); - -#endif /* META_DND_PRIVATE_H */ diff --git a/src/compositor/meta-feedback-actor-private.h b/src/compositor/meta-feedback-actor-private.h index eb181faad..e86d799f5 100644 --- a/src/compositor/meta-feedback-actor-private.h +++ b/src/compositor/meta-feedback-actor-private.h @@ -20,8 +20,7 @@ * Author: Carlos Garnacho */ -#ifndef META_FEEDBACK_ACTOR_PRIVATE_H -#define META_FEEDBACK_ACTOR_PRIVATE_H +#pragma once #include "clutter/clutter.h" #include "meta/types.h" @@ -68,5 +67,3 @@ void meta_feedback_actor_set_geometry_scale (MetaFeedbackActor *self, int geometry_scale); int meta_feedback_actor_get_geometry_scale (MetaFeedbackActor *self); - -#endif /* META_FEEDBACK_ACTOR_PRIVATE_H */ diff --git a/src/compositor/meta-later-private.h b/src/compositor/meta-later-private.h index ea9359d15..5e241022b 100644 --- a/src/compositor/meta-later-private.h +++ b/src/compositor/meta-later-private.h @@ -15,13 +15,10 @@ * along with this program; if not, see . */ -#ifndef META_LATER_PRIVATE_H -#define META_LATER_PRIVATE_H +#pragma once #include MetaLaters * meta_laters_new (MetaCompositor *compositor); void meta_laters_free (MetaLaters *laters); - -#endif /* META_LATER_PRIVATE_H */ diff --git a/src/compositor/meta-module.h b/src/compositor/meta-module.h index dd6d5a685..64a9f7639 100644 --- a/src/compositor/meta-module.h +++ b/src/compositor/meta-module.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_MODULE_H_ -#define META_MODULE_H_ +#pragma once #include @@ -51,5 +50,3 @@ struct _MetaModuleClass GType meta_module_get_type (void); GType meta_module_get_plugin_type (MetaModule *module); - -#endif diff --git a/src/compositor/meta-multi-texture-format-private.h b/src/compositor/meta-multi-texture-format-private.h index b069e7126..f17db98b4 100644 --- a/src/compositor/meta-multi-texture-format-private.h +++ b/src/compositor/meta-multi-texture-format-private.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_MULTI_TEXTURE_FORMAT_PRIVATE_H -#define META_MULTI_TEXTURE_FORMAT_PRIVATE_H +#pragma once #include @@ -45,5 +44,3 @@ gboolean meta_multi_texture_format_get_snippets (MetaMultiTextureFormat format CoglSnippet **fragment_snippet); G_END_DECLS - -#endif /* META_MULTI_TEXTURE_FORMAT_PRIVATE_H */ diff --git a/src/compositor/meta-plugin-manager.h b/src/compositor/meta-plugin-manager.h index a5fe0315a..dd0dbaa2a 100644 --- a/src/compositor/meta-plugin-manager.h +++ b/src/compositor/meta-plugin-manager.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_PLUGIN_MANAGER_H_ -#define META_PLUGIN_MANAGER_H_ +#pragma once #include "core/util-private.h" #include "meta/meta-plugin.h" @@ -103,5 +102,3 @@ MetaInhibitShortcutsDialog * MetaWindow *window); void meta_plugin_manager_locate_pointer (MetaPluginManager *mgr); - -#endif diff --git a/src/compositor/meta-shaped-texture-private.h b/src/compositor/meta-shaped-texture-private.h index 997f4a338..c276ee233 100644 --- a/src/compositor/meta-shaped-texture-private.h +++ b/src/compositor/meta-shaped-texture-private.h @@ -24,8 +24,7 @@ * 02111-1307, USA. */ -#ifndef __META_SHAPED_TEXTURE_PRIVATE_H__ -#define __META_SHAPED_TEXTURE_PRIVATE_H__ +#pragma once #include "backends/meta-monitor-manager-private.h" #include "meta/meta-shaped-texture.h" @@ -77,5 +76,3 @@ void meta_shaped_texture_set_opaque_region (MetaShapedTexture *stex, void meta_shaped_texture_ensure_size_valid (MetaShapedTexture *stex); gboolean meta_shaped_texture_should_get_via_offscreen (MetaShapedTexture *stex); - -#endif diff --git a/src/compositor/meta-surface-actor-wayland.h b/src/compositor/meta-surface-actor-wayland.h index fa0550f66..36b16640b 100644 --- a/src/compositor/meta-surface-actor-wayland.h +++ b/src/compositor/meta-surface-actor-wayland.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef __META_SURFACE_ACTOR_WAYLAND_H__ -#define __META_SURFACE_ACTOR_WAYLAND_H__ +#pragma once #include @@ -48,5 +47,3 @@ gboolean meta_surface_actor_wayland_is_view_primary (MetaSurfaceActor *actor, ClutterStageView *stage_view); G_END_DECLS - -#endif /* __META_SURFACE_ACTOR_WAYLAND_H__ */ diff --git a/src/compositor/meta-surface-actor-x11.h b/src/compositor/meta-surface-actor-x11.h index 0a8517236..7a72afa75 100644 --- a/src/compositor/meta-surface-actor-x11.h +++ b/src/compositor/meta-surface-actor-x11.h @@ -23,8 +23,7 @@ * Jasper St. Pierre */ -#ifndef __META_SURFACE_ACTOR_X11_H__ -#define __META_SURFACE_ACTOR_X11_H__ +#pragma once #include @@ -58,5 +57,3 @@ gboolean meta_surface_actor_x11_is_visible (MetaSurfaceActorX11 *self); void meta_surface_actor_x11_handle_updates (MetaSurfaceActorX11 *self); G_END_DECLS - -#endif /* __META_SURFACE_ACTOR_X11_H__ */ diff --git a/src/compositor/meta-surface-actor.h b/src/compositor/meta-surface-actor.h index f69cb1527..ff9bedbfe 100644 --- a/src/compositor/meta-surface-actor.h +++ b/src/compositor/meta-surface-actor.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef META_SURFACE_ACTOR_PRIVATE_H -#define META_SURFACE_ACTOR_PRIVATE_H +#pragma once #include "config.h" @@ -55,5 +54,3 @@ gboolean meta_surface_actor_is_frozen (MetaSurfaceActor *actor); void meta_surface_actor_set_frozen (MetaSurfaceActor *actor, gboolean frozen); G_END_DECLS - -#endif /* META_SURFACE_ACTOR_PRIVATE_H */ diff --git a/src/compositor/meta-sync-ring.h b/src/compositor/meta-sync-ring.h index d9739455b..0f96f51e3 100644 --- a/src/compositor/meta-sync-ring.h +++ b/src/compositor/meta-sync-ring.h @@ -1,5 +1,4 @@ -#ifndef _META_SYNC_RING_H_ -#define _META_SYNC_RING_H_ +#pragma once #include #include @@ -9,5 +8,3 @@ void meta_sync_ring_destroy (void); gboolean meta_sync_ring_after_frame (void); gboolean meta_sync_ring_insert_wait (void); void meta_sync_ring_handle_event (XEvent *event); - -#endif /* _META_SYNC_RING_H_ */ diff --git a/src/compositor/meta-texture-mipmap.h b/src/compositor/meta-texture-mipmap.h index 8b47162a9..4b91f83d3 100644 --- a/src/compositor/meta-texture-mipmap.h +++ b/src/compositor/meta-texture-mipmap.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_TEXTURE_MIPMAP_H -#define META_TEXTURE_MIPMAP_H +#pragma once #include "clutter/clutter.h" #include "meta/meta-multi-texture.h" @@ -52,5 +51,3 @@ void meta_texture_mipmap_invalidate (MetaTextureMipmap *mipmap); void meta_texture_mipmap_clear (MetaTextureMipmap *mipmap); G_END_DECLS - -#endif /* META_TEXTURE_MIPMAP_H */ diff --git a/src/compositor/meta-window-actor-private.h b/src/compositor/meta-window-actor-private.h index c1f46d590..a20068e77 100644 --- a/src/compositor/meta-window-actor-private.h +++ b/src/compositor/meta-window-actor-private.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef META_WINDOW_ACTOR_PRIVATE_H -#define META_WINDOW_ACTOR_PRIVATE_H +#pragma once #include "compositor/meta-plugin-manager.h" #include "compositor/meta-surface-actor.h" @@ -112,5 +111,3 @@ gboolean meta_window_actor_is_opaque (MetaWindowActor *self); void meta_window_actor_update_regions (MetaWindowActor *self); gboolean meta_window_actor_can_freeze_commits (MetaWindowActor *self); - -#endif /* META_WINDOW_ACTOR_PRIVATE_H */ diff --git a/src/compositor/meta-window-actor-wayland.h b/src/compositor/meta-window-actor-wayland.h index 56c3f1241..7c88efc65 100644 --- a/src/compositor/meta-window-actor-wayland.h +++ b/src/compositor/meta-window-actor-wayland.h @@ -20,8 +20,7 @@ * Georges Basile Stavracas Neto */ -#ifndef META_WINDOW_ACTOR_WAYLAND_H -#define META_WINDOW_ACTOR_WAYLAND_H +#pragma once #include "compositor/meta-window-actor-private.h" @@ -38,5 +37,3 @@ G_DECLARE_FINAL_TYPE (MetaSurfaceContainerActorWayland, ClutterActor) void meta_window_actor_wayland_rebuild_surface_tree (MetaWindowActor *actor); - -#endif /*META_WINDOW_ACTOR_WAYLAND_H */ diff --git a/src/compositor/meta-window-actor-x11.h b/src/compositor/meta-window-actor-x11.h index 86b80034d..e55ab9a28 100644 --- a/src/compositor/meta-window-actor-x11.h +++ b/src/compositor/meta-window-actor-x11.h @@ -20,8 +20,7 @@ * Georges Basile Stavracas Neto */ -#ifndef META_WINDOW_ACTOR_X11_H -#define META_WINDOW_ACTOR_X11_H +#pragma once #include "compositor/meta-window-actor-private.h" @@ -43,5 +42,3 @@ void meta_window_actor_x11_update_shape (MetaWindowActorX11 *actor_x11); void meta_window_actor_x11_process_damage (MetaWindowActorX11 *actor_x11, XDamageNotifyEvent *event); - -#endif /* META_WINDOW_ACTOR_X11_H */ diff --git a/src/compositor/meta-window-drag.h b/src/compositor/meta-window-drag.h index 7fe501dd4..ea3a90059 100644 --- a/src/compositor/meta-window-drag.h +++ b/src/compositor/meta-window-drag.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WINDOW_DRAG_H -#define META_WINDOW_DRAG_H +#pragma once #include "meta/common.h" #include "meta/window.h" @@ -46,5 +45,3 @@ MetaWindow * meta_window_drag_get_window (MetaWindowDrag *window_drag); MetaGrabOp meta_window_drag_get_grab_op (MetaWindowDrag *window_drag); void meta_window_drag_update_edges (MetaWindowDrag *window_drag); - -#endif /* META_WINDOW_DRAG_H */ diff --git a/src/compositor/meta-window-group-private.h b/src/compositor/meta-window-group-private.h index c3467066b..3033a06e2 100644 --- a/src/compositor/meta-window-group-private.h +++ b/src/compositor/meta-window-group-private.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef META_WINDOW_GROUP_PRIVATE_H -#define META_WINDOW_GROUP_PRIVATE_H +#pragma once #include "meta/display.h" #include "meta/meta-window-group.h" @@ -19,5 +18,3 @@ typedef struct _MetaWindowGroupPrivate MetaWindowGroupPrivate; ClutterActor *meta_window_group_new (MetaDisplay *display); - -#endif /* META_WINDOW_GROUP_PRIVATE_H */ diff --git a/src/compositor/region-utils.h b/src/compositor/region-utils.h index cf7315192..a15900733 100644 --- a/src/compositor/region-utils.h +++ b/src/compositor/region-utils.h @@ -18,8 +18,7 @@ * along with this program; if not, see . */ -#ifndef __META_REGION_UTILS_H__ -#define __META_REGION_UTILS_H__ +#pragma once #include #include @@ -122,5 +121,3 @@ void meta_region_to_cairo_path (cairo_region_t *region, cairo_region_t * meta_region_apply_matrix_transform_expand (const cairo_region_t *region, graphene_matrix_t *transform); - -#endif /* __META_REGION_UTILS_H__ */ diff --git a/src/core/boxes-private.h b/src/core/boxes-private.h index 09cbd6e09..6a9fbe11c 100644 --- a/src/core/boxes-private.h +++ b/src/core/boxes-private.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_BOXES_PRIVATE_H -#define META_BOXES_PRIVATE_H +#pragma once #include @@ -288,5 +287,3 @@ void meta_rectangle_crop_and_scale (const MetaRectangle *rect, int dst_width, int dst_height, MetaRectangle *dest); - -#endif /* META_BOXES_PRIVATE_H */ diff --git a/src/core/constraints.h b/src/core/constraints.h index eaa4e4594..80fe83081 100644 --- a/src/core/constraints.h +++ b/src/core/constraints.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_CONSTRAINTS_H -#define META_CONSTRAINTS_H +#pragma once #include "core/frame.h" #include "core/window-private.h" @@ -35,5 +34,3 @@ void meta_window_constrain (MetaWindow *window, MetaRectangle *intermediate, int *rel_x, int *rel_y); - -#endif /* META_CONSTRAINTS_H */ diff --git a/src/core/display-private.h b/src/core/display-private.h index e19ada740..daa12a573 100644 --- a/src/core/display-private.h +++ b/src/core/display-private.h @@ -22,8 +22,7 @@ * along with this program; if not, see . */ -#ifndef META_DISPLAY_PRIVATE_H -#define META_DISPLAY_PRIVATE_H +#pragma once #include "meta/display.h" @@ -352,5 +351,3 @@ gboolean meta_display_process_captured_input (MetaDisplay *display, const ClutterEvent *event); void meta_display_cancel_input_capture (MetaDisplay *display); - -#endif diff --git a/src/core/events.h b/src/core/events.h index 5b48d3905..590b85650 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_EVENTS_H -#define META_EVENTS_H +#pragma once #include "meta/display.h" @@ -35,5 +34,3 @@ void meta_display_init_events (MetaDisplay *display); void meta_display_free_events (MetaDisplay *display); - -#endif diff --git a/src/core/frame.h b/src/core/frame.h index bee62bb1a..ee5e5a567 100644 --- a/src/core/frame.h +++ b/src/core/frame.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_FRAME_PRIVATE_H -#define META_FRAME_PRIVATE_H +#pragma once #include "core/window-private.h" @@ -84,5 +83,3 @@ MetaSyncCounter * meta_frame_get_sync_counter (MetaFrame *frame); void meta_frame_set_opaque_region (MetaFrame *frame, cairo_region_t *region); - -#endif diff --git a/src/core/keybindings-private.h b/src/core/keybindings-private.h index 5895c7cf1..0a05dd577 100644 --- a/src/core/keybindings-private.h +++ b/src/core/keybindings-private.h @@ -24,8 +24,7 @@ * along with this program; if not, see . */ -#ifndef META_KEYBINDINGS_PRIVATE_H -#define META_KEYBINDINGS_PRIVATE_H +#pragma once #include #include @@ -157,5 +156,3 @@ void meta_x11_display_ungrab_keys (MetaX11Display *x11_display); gboolean meta_display_process_keybinding_event (MetaDisplay *display, const char *name, const ClutterEvent *event); - -#endif diff --git a/src/core/meta-accel-parse.h b/src/core/meta-accel-parse.h index f3d5ca94f..04b4fa196 100644 --- a/src/core/meta-accel-parse.h +++ b/src/core/meta-accel-parse.h @@ -21,8 +21,7 @@ * Jasper St. Pierre */ -#ifndef META_ACCEL_PARSE_H -#define META_ACCEL_PARSE_H +#pragma once #include @@ -40,5 +39,3 @@ gboolean meta_parse_accelerator (const char *accel, MetaKeyCombo *combo); gboolean meta_parse_modifier (const char *accel, ClutterModifierType *mask); - -#endif /* META_ACCEL_PARSE_H */ diff --git a/src/core/meta-anonymous-file.h b/src/core/meta-anonymous-file.h index 5289c7193..dca7fa4da 100644 --- a/src/core/meta-anonymous-file.h +++ b/src/core/meta-anonymous-file.h @@ -19,8 +19,7 @@ * Author: Sebastian Wick */ -#ifndef META_ANONYMOUS_FILE_H -#define META_ANONYMOUS_FILE_H +#pragma once #include "meta/common.h" #include "core/util-private.h" @@ -49,5 +48,3 @@ int meta_anonymous_file_open_fd (MetaAnonymousFile *file, META_EXPORT_TEST void meta_anonymous_file_close_fd (int fd); - -#endif /* META_ANONYMOUS_FILE_H */ diff --git a/src/core/meta-border.h b/src/core/meta-border.h index dd76db5c9..788c6875c 100644 --- a/src/core/meta-border.h +++ b/src/core/meta-border.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_BORDER_H -#define META_BORDER_H +#pragma once #include @@ -80,5 +79,3 @@ meta_border_get_allows_directions (MetaBorder *border); void meta_border_set_allows_directions (MetaBorder *border, unsigned int directions); - -#endif /* META_BORDER_H */ diff --git a/src/core/meta-clipboard-manager.h b/src/core/meta-clipboard-manager.h index 2ba130f9b..a5001d077 100644 --- a/src/core/meta-clipboard-manager.h +++ b/src/core/meta-clipboard-manager.h @@ -19,12 +19,9 @@ * Author: Carlos Garnacho */ -#ifndef META_CLIPBOARD_MANAGER_H -#define META_CLIPBOARD_MANAGER_H +#pragma once #include "core/display-private.h" void meta_clipboard_manager_init (MetaDisplay *display); void meta_clipboard_manager_shutdown (MetaDisplay *display); - -#endif /* META_CLIPBOARD_MANAGER_H */ diff --git a/src/core/meta-context-main.h b/src/core/meta-context-main.h index 9a8ce902b..b305223e6 100644 --- a/src/core/meta-context-main.h +++ b/src/core/meta-context-main.h @@ -18,8 +18,7 @@ * */ -#ifndef META_CONTEXT_MAIN_H -#define META_CONTEXT_MAIN_H +#pragma once #include "core/meta-context-private.h" @@ -27,5 +26,3 @@ G_DECLARE_FINAL_TYPE (MetaContextMain, meta_context_main, META, CONTEXT_MAIN, MetaContext) - -#endif /* META_CONTEXT_MAIN_H */ diff --git a/src/core/meta-context-private.h b/src/core/meta-context-private.h index e9852631f..a13c8fcbf 100644 --- a/src/core/meta-context-private.h +++ b/src/core/meta-context-private.h @@ -18,8 +18,7 @@ * */ -#ifndef META_CONTEXT_PRIVATE_H -#define META_CONTEXT_PRIVATE_H +#pragma once #include "core/meta-private-enums.h" #include "core/meta-service-channel.h" @@ -87,5 +86,3 @@ meta_context_get_profiler (MetaContext *context); void meta_context_set_trace_file (MetaContext *context, const char *trace_file); #endif - -#endif /* META_CONTEXT_PRIVATE_H */ diff --git a/src/core/meta-fraction.h b/src/core/meta-fraction.h index f7ab294cd..d24ae2ce0 100644 --- a/src/core/meta-fraction.h +++ b/src/core/meta-fraction.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_FRACTION_H -#define META_FRACTION_H +#pragma once typedef struct _MetaFraction { @@ -27,5 +26,3 @@ typedef struct _MetaFraction } MetaFraction; MetaFraction meta_fraction_from_double (double src); - -#endif /* META_FRACTION_H */ diff --git a/src/core/meta-gesture-tracker-private.h b/src/core/meta-gesture-tracker-private.h index e7bfc5472..3a2e3310e 100644 --- a/src/core/meta-gesture-tracker-private.h +++ b/src/core/meta-gesture-tracker-private.h @@ -21,8 +21,7 @@ * Author: Carlos Garnacho */ -#ifndef META_GESTURE_TRACKER_PRIVATE_H -#define META_GESTURE_TRACKER_PRIVATE_H +#pragma once #include @@ -66,5 +65,3 @@ gboolean meta_gesture_tracker_set_sequence_state (MetaGestureTracker MetaSequenceState meta_gesture_tracker_get_sequence_state (MetaGestureTracker *tracker, ClutterEventSequence *sequence); gint meta_gesture_tracker_get_n_current_touches (MetaGestureTracker *tracker); - -#endif /* META_GESTURE_TRACKER_PRIVATE_H */ diff --git a/src/core/meta-inhibit-shortcuts-dialog-default-private.h b/src/core/meta-inhibit-shortcuts-dialog-default-private.h index 7f65494ef..d08fecb3a 100644 --- a/src/core/meta-inhibit-shortcuts-dialog-default-private.h +++ b/src/core/meta-inhibit-shortcuts-dialog-default-private.h @@ -16,8 +16,7 @@ * */ -#ifndef META_INHIBIT_SHORTCUTS_DIALOG_DEFAULT_H -#define META_INHIBIT_SHORTCUTS_DIALOG_DEFAULT_H +#pragma once #include @@ -30,5 +29,3 @@ G_DECLARE_FINAL_TYPE (MetaInhibitShortcutsDialogDefault, GObject) MetaInhibitShortcutsDialog * meta_inhibit_shortcuts_dialog_default_new (MetaWindow *window); - -#endif /* META_INHIBIT_SHORTCUTS_DIALOG_DEFAULT_H */ diff --git a/src/core/meta-pad-action-mapper.h b/src/core/meta-pad-action-mapper.h index 8c739bdd4..4de3954ae 100644 --- a/src/core/meta-pad-action-mapper.h +++ b/src/core/meta-pad-action-mapper.h @@ -20,8 +20,7 @@ * Carlos Garnacho */ -#ifndef META_PAD_ACTION_MAPPER_H -#define META_PAD_ACTION_MAPPER_H +#pragma once #include "clutter/clutter.h" #include "meta/display.h" @@ -48,5 +47,3 @@ char * meta_pad_action_mapper_get_feature_label (MetaPadActionMapper *mapper, MetaPadFeatureType feature, MetaPadDirection direction, int number); - -#endif /* META_PAD_ACTION_MAPPER_H */ diff --git a/src/core/meta-private-enums.h b/src/core/meta-private-enums.h index ae6a9bbe5..209fe8007 100644 --- a/src/core/meta-private-enums.h +++ b/src/core/meta-private-enums.h @@ -18,8 +18,7 @@ * */ -#ifndef META_PRIVATE_ENUMS_H -#define META_PRIVATE_ENUMS_H +#pragma once typedef enum _MetaX11DisplayPolicy { @@ -33,5 +32,3 @@ typedef enum META_QUEUE_CALC_SHOWING = 1 << 0, META_QUEUE_MOVE_RESIZE = 1 << 1, } MetaQueueType; - -#endif /* META_PRIVATE_ENUMS_H */ diff --git a/src/core/meta-profiler.h b/src/core/meta-profiler.h index 2ff5edf66..309fb3200 100644 --- a/src/core/meta-profiler.h +++ b/src/core/meta-profiler.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_PROFILER_H -#define META_PROFILER_H +#pragma once #include @@ -44,5 +43,3 @@ void meta_profiler_unregister_thread (MetaProfiler *profiler, GMainContext *main_context); G_END_DECLS - -#endif /* META_PROFILER_H */ diff --git a/src/core/meta-selection-private.h b/src/core/meta-selection-private.h index 5c04849f7..945fb38a7 100644 --- a/src/core/meta-selection-private.h +++ b/src/core/meta-selection-private.h @@ -20,8 +20,7 @@ * Carlos Garnacho */ -#ifndef META_SELECTION_PRIVATE_H -#define META_SELECTION_PRIVATE_H +#pragma once #include "meta/meta-selection.h" @@ -30,5 +29,3 @@ MetaSelectionSource * MetaSelectionType selection_type); MetaDisplay * meta_selection_get_display (MetaSelection *selection); - -#endif /* META_SELECTION_PRIVATE_H */ diff --git a/src/core/meta-selection-source-remote.h b/src/core/meta-selection-source-remote.h index 51e66957b..781ffd164 100644 --- a/src/core/meta-selection-source-remote.h +++ b/src/core/meta-selection-source-remote.h @@ -18,8 +18,7 @@ * */ -#ifndef META_SELECTION_SOURCE_REMOTE_H -#define META_SELECTION_SOURCE_REMOTE_H +#pragma once #include "backends/meta-remote-desktop.h" #include "meta/meta-selection-source.h" @@ -39,5 +38,3 @@ void meta_selection_source_remote_cancel_transfer (MetaSelectionSourceRemote *so MetaSelectionSourceRemote * meta_selection_source_remote_new (MetaRemoteDesktopSession *session, GList *mime_types); - -#endif /* META_SELECTION_SOURCE_REMOTE_H */ diff --git a/src/core/meta-service-channel.h b/src/core/meta-service-channel.h index e88e4d775..3c69bdd99 100644 --- a/src/core/meta-service-channel.h +++ b/src/core/meta-service-channel.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_SERVICE_CHANNEL_H -#define META_SERVICE_CHANNEL_H +#pragma once #ifdef HAVE_WAYLAND @@ -47,5 +46,3 @@ MetaWaylandClient * meta_service_channel_get_service_client (MetaServiceChannel MetaServiceClientType service_client_type); #endif /* HAVE_WAYLAND */ - -#endif /* META_SERVICE_CHANNEL_H */ diff --git a/src/core/meta-workspace-manager-private.h b/src/core/meta-workspace-manager-private.h index fec027024..ea278f883 100644 --- a/src/core/meta-workspace-manager-private.h +++ b/src/core/meta-workspace-manager-private.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_WORKSPACE_MANAGER_PRIVATE_H -#define META_WORKSPACE_MANAGER_PRIVATE_H +#pragma once #include @@ -93,5 +92,3 @@ META_EXPORT_TEST void meta_workspace_manager_update_num_workspaces (MetaWorkspaceManager *workspace_manager, guint32 timestamp, int new_num); - -#endif /* META_WORKSPACE_MANAGER_PRIVATE_H */ diff --git a/src/core/place.h b/src/core/place.h index 2e2c81141..57a4d3856 100644 --- a/src/core/place.h +++ b/src/core/place.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_PLACE_H -#define META_PLACE_H +#pragma once #include "core/frame.h" #include "core/window-private.h" @@ -35,5 +34,3 @@ void meta_window_place (MetaWindow *window, int y, int *new_x, int *new_y); - -#endif diff --git a/src/core/prefs-private.h b/src/core/prefs-private.h index e587bfaa1..f1117c5b6 100644 --- a/src/core/prefs-private.h +++ b/src/core/prefs-private.h @@ -18,9 +18,6 @@ * */ -#ifndef PREFS_PRIVATE_H -#define PREFS_PRIVATE_H +#pragma once void meta_prefs_init (void); - -#endif /* PREFS_PRIVATE_H */ diff --git a/src/core/stack-tracker.h b/src/core/stack-tracker.h index dbffb0e5e..76e50fc0c 100644 --- a/src/core/stack-tracker.h +++ b/src/core/stack-tracker.h @@ -31,8 +31,7 @@ * along with this program; if not, see . */ -#ifndef META_STACK_TRACKER_H -#define META_STACK_TRACKER_H +#pragma once #include "core/util-private.h" #include "meta/display.h" @@ -83,5 +82,3 @@ void meta_stack_tracker_get_stack (MetaStackTracker *tracker, void meta_stack_tracker_sync_stack (MetaStackTracker *tracker); void meta_stack_tracker_queue_sync_stack (MetaStackTracker *tracker); - -#endif /* META_STACK_TRACKER_H */ diff --git a/src/core/stack.h b/src/core/stack.h index 998bcea4f..ba07b0037 100644 --- a/src/core/stack.h +++ b/src/core/stack.h @@ -18,8 +18,7 @@ * along with this program; if not, see . */ -#ifndef META_STACK_H -#define META_STACK_H +#pragma once /** * stack: @@ -338,5 +337,3 @@ void meta_stack_set_positions (MetaStack *stack, void meta_stack_update_window_tile_matches (MetaStack *stack, MetaWorkspace *workspace); - -#endif diff --git a/src/core/startup-notification-private.h b/src/core/startup-notification-private.h index 608ca6852..2655e9907 100644 --- a/src/core/startup-notification-private.h +++ b/src/core/startup-notification-private.h @@ -22,8 +22,7 @@ * along with this program; if not, see . */ -#ifndef META_STARTUP_NOTIFICATION_PRIVATE_H -#define META_STARTUP_NOTIFICATION_PRIVATE_H +#pragma once #include "core/display-private.h" #include "meta/meta-startup-notification.h" @@ -50,5 +49,3 @@ MetaStartupSequence * const gchar *id); MetaDisplay * meta_startup_sequence_get_display (MetaStartupSequence *seq); - -#endif /* META_STARTUP_NOTIFICATION_PRIVATE_H */ diff --git a/src/core/util-private.h b/src/core/util-private.h index 0568c6850..1ce35245c 100644 --- a/src/core/util-private.h +++ b/src/core/util-private.h @@ -22,8 +22,7 @@ * 02111-1307, USA. */ -#ifndef META_UTIL_PRIVATE_H -#define META_UTIL_PRIVATE_H +#pragma once #include #include @@ -59,5 +58,3 @@ meta_timeval_to_microseconds (const struct timeval *tv) #define META_CONTAINER_OF(ptr, type, member) \ (type *) ((uint8_t *) (ptr) - G_STRUCT_OFFSET (type, member)) - -#endif diff --git a/src/core/window-private.h b/src/core/window-private.h index 58ff69324..6c1244d52 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -29,8 +29,7 @@ * along with this program; if not, see . */ -#ifndef META_WINDOW_PRIVATE_H -#define META_WINDOW_PRIVATE_H +#pragma once #include #include @@ -892,5 +891,3 @@ void meta_window_set_frame_xwindow (MetaWindow *window, void meta_window_maybe_apply_size_hints (MetaWindow *window, MetaRectangle *target_rect); - -#endif diff --git a/src/core/workspace-private.h b/src/core/workspace-private.h index 6afd5562a..49faf19a0 100644 --- a/src/core/workspace-private.h +++ b/src/core/workspace-private.h @@ -28,8 +28,7 @@ * along with this program; if not, see . */ -#ifndef META_WORKSPACE_PRIVATE_H -#define META_WORKSPACE_PRIVATE_H +#pragma once #include "core/window-private.h" #include "meta/workspace.h" @@ -106,5 +105,3 @@ GList * meta_workspace_get_default_focus_candidates (MetaWorkspace *workspace); const char* meta_workspace_get_name (MetaWorkspace *workspace); void meta_workspace_index_changed (MetaWorkspace *workspace); - -#endif diff --git a/src/frames/meta-frame-content.h b/src/frames/meta-frame-content.h index 6125ef931..328804e57 100644 --- a/src/frames/meta-frame-content.h +++ b/src/frames/meta-frame-content.h @@ -17,8 +17,7 @@ * Author: Carlos Garnacho */ -#ifndef META_FRAME_CONTENT_H -#define META_FRAME_CONTENT_H +#pragma once #include @@ -33,5 +32,3 @@ GtkWidget * meta_frame_content_new (Window window); Window meta_frame_content_get_window (MetaFrameContent *content); GtkBorder meta_frame_content_get_border (MetaFrameContent *content); - -#endif /* META_FRAME_CONTENT_H */ diff --git a/src/frames/meta-frame-header.h b/src/frames/meta-frame-header.h index 758fac8e7..aaef68a7f 100644 --- a/src/frames/meta-frame-header.h +++ b/src/frames/meta-frame-header.h @@ -17,8 +17,7 @@ * Author: Carlos Garnacho */ -#ifndef META_FRAME_HEADER_H -#define META_FRAME_HEADER_H +#pragma once #include @@ -28,4 +27,3 @@ G_DECLARE_FINAL_TYPE (MetaFrameHeader, meta_frame_header, GtkWidget * meta_frame_header_new (void); -#endif /* META_FRAME_HEADER_H */ diff --git a/src/frames/meta-frame.h b/src/frames/meta-frame.h index d39dc8218..b67542b61 100644 --- a/src/frames/meta-frame.h +++ b/src/frames/meta-frame.h @@ -17,8 +17,7 @@ * Author: Carlos Garnacho */ -#ifndef META_FRAME_H -#define META_FRAME_H +#pragma once #include #include @@ -31,5 +30,3 @@ GtkWidget * meta_frame_new (Window window); void meta_frame_handle_xevent (MetaFrame *frame, Window window, XEvent *xevent); - -#endif /* META_FRAME_CONTENT_H */ diff --git a/src/frames/meta-window-tracker.h b/src/frames/meta-window-tracker.h index 4b52b33e9..f4cc11b8a 100644 --- a/src/frames/meta-window-tracker.h +++ b/src/frames/meta-window-tracker.h @@ -17,8 +17,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WINDOW_TRACKER_H -#define META_WINDOW_TRACKER_H +#pragma once #include #include @@ -29,5 +28,3 @@ G_DECLARE_FINAL_TYPE (MetaWindowTracker, meta_window_tracker, GObject) MetaWindowTracker * meta_window_tracker_new (GdkDisplay *display); - -#endif /* META_WINDOW_TRACKER_H */ diff --git a/src/meta-private-enum-types.h.in b/src/meta-private-enum-types.h.in index 2427a0c68..692d6f631 100644 --- a/src/meta-private-enum-types.h.in +++ b/src/meta-private-enum-types.h.in @@ -1,6 +1,5 @@ /*** BEGIN file-header ***/ -#ifndef META_PRIVATE_ENUM_TYPES_H -#define META_PRIVATE_ENUM_TYPES_H +#pragma once #include @@ -15,7 +14,6 @@ G_BEGIN_DECLS /*** BEGIN file-tail ***/ G_END_DECLS -#endif /* !__MUTTER_ENUM_TYPES_H__ */ /*** END file-tail ***/ /*** BEGIN value-header ***/ diff --git a/src/meta/barrier.h b/src/meta/barrier.h index 844bfe824..27e4e08e0 100644 --- a/src/meta/barrier.h +++ b/src/meta/barrier.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; c-basic-offset: 2; -*- */ -#ifndef __META_BARRIER_H__ -#define __META_BARRIER_H__ +#pragma once #include @@ -106,5 +105,3 @@ META_EXPORT GType meta_barrier_event_get_type (void) G_GNUC_CONST; G_END_DECLS - -#endif /* __META_BARRIER_H__ */ diff --git a/src/meta/boxes.h b/src/meta/boxes.h index 40683bb1f..b2130a333 100644 --- a/src/meta/boxes.h +++ b/src/meta/boxes.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_BOXES_H -#define META_BOXES_H +#pragma once #include #include @@ -163,5 +162,3 @@ gboolean meta_rectangle_could_fit_rect (const MetaRectangle *outer_rect, META_EXPORT gboolean meta_rectangle_contains_rect (const MetaRectangle *outer_rect, const MetaRectangle *inner_rect); - -#endif /* META_BOXES_H */ diff --git a/src/meta/common.h b/src/meta/common.h index 6c29a531d..6c116e095 100644 --- a/src/meta/common.h +++ b/src/meta/common.h @@ -22,8 +22,7 @@ * along with this program; if not, see . */ -#ifndef META_COMMON_H -#define META_COMMON_H +#pragma once #include #include @@ -168,5 +167,3 @@ void meta_frame_borders_clear (MetaFrameBorders *self); #define META_PRIORITY_PREFS_NOTIFY (G_PRIORITY_DEFAULT_IDLE + 10) /************************************************************/ - -#endif diff --git a/src/meta/compositor-mutter.h b/src/meta/compositor-mutter.h index f61df1334..a6064e11c 100644 --- a/src/meta/compositor-mutter.h +++ b/src/meta/compositor-mutter.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef MUTTER_H_ -#define MUTTER_H_ +#pragma once #include "clutter/clutter.h" #include "meta/compositor.h" @@ -57,5 +56,3 @@ void meta_focus_stage_window (MetaDisplay *display, META_EXPORT gboolean meta_stage_is_focused (MetaDisplay *display); - -#endif diff --git a/src/meta/compositor.h b/src/meta/compositor.h index 1263a4add..6debcccdb 100644 --- a/src/meta/compositor.h +++ b/src/meta/compositor.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_COMPOSITOR_H -#define META_COMPOSITOR_H +#pragma once #include @@ -72,5 +71,3 @@ MetaLaters * meta_compositor_get_laters (MetaCompositor *compositor); META_EXPORT ClutterActor * meta_compositor_get_feedback_group (MetaCompositor *compositor); - -#endif /* META_COMPOSITOR_H */ diff --git a/src/meta/display.h b/src/meta/display.h index a5ba47d48..0c19f7d77 100644 --- a/src/meta/display.h +++ b/src/meta/display.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_DISPLAY_H -#define META_DISPLAY_H +#pragma once #include #include @@ -308,5 +307,3 @@ void meta_display_set_input_focus (MetaDisplay *display, META_EXPORT void meta_display_unset_input_focus (MetaDisplay *display, guint32 timestamp); - -#endif diff --git a/src/meta/group.h b/src/meta/group.h index 5567cf466..3ecf619f1 100644 --- a/src/meta/group.h +++ b/src/meta/group.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_GROUP_H -#define META_GROUP_H +#pragma once #include #include @@ -61,5 +60,3 @@ int meta_group_get_size (MetaGroup *group); META_EXPORT gboolean meta_group_property_notify (MetaGroup *group, XEvent *event); - -#endif diff --git a/src/meta/keybindings.h b/src/meta/keybindings.h index 3782c0b40..adfff59ad 100644 --- a/src/meta/keybindings.h +++ b/src/meta/keybindings.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_KEYBINDINGS_H -#define META_KEYBINDINGS_H +#pragma once #include #include @@ -43,4 +42,3 @@ gboolean meta_keybindings_set_custom_handler (const gchar *name, MetaKeyHandlerFunc handler, gpointer user_data, GDestroyNotify free_data); -#endif diff --git a/src/meta/main.h b/src/meta/main.h index 2639b8d89..f60e15d12 100644 --- a/src/meta/main.h +++ b/src/meta/main.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_MAIN_H -#define META_MAIN_H +#pragma once #include @@ -48,5 +47,3 @@ typedef enum /* exit immediately */ META_EXPORT void meta_exit (MetaExitCode code) G_GNUC_NORETURN; - -#endif diff --git a/src/meta/meta-backend.h b/src/meta/meta-backend.h index d65c2fb8d..d0df1c1b4 100644 --- a/src/meta/meta-backend.h +++ b/src/meta/meta-backend.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef META_BACKEND_H -#define META_BACKEND_H +#pragma once #include @@ -85,5 +84,3 @@ MetaBackendCapabilities meta_backend_get_capabilities (MetaBackend *backend); META_EXPORT void meta_clutter_init (void); - -#endif /* META_BACKEND_H */ diff --git a/src/meta/meta-background-actor.h b/src/meta/meta-background-actor.h index 96712c06c..40b7bb5d6 100644 --- a/src/meta/meta-background-actor.h +++ b/src/meta/meta-background-actor.h @@ -18,8 +18,7 @@ * along with this program; if not, see . */ -#ifndef META_BACKGROUND_ACTOR_H -#define META_BACKGROUND_ACTOR_H +#pragma once #include @@ -47,5 +46,3 @@ G_DECLARE_FINAL_TYPE (MetaBackgroundActor, META_EXPORT ClutterActor *meta_background_actor_new (MetaDisplay *display, int monitor); - -#endif /* META_BACKGROUND_ACTOR_H */ diff --git a/src/meta/meta-background-content.h b/src/meta/meta-background-content.h index 081c64acb..79af3a40c 100644 --- a/src/meta/meta-background-content.h +++ b/src/meta/meta-background-content.h @@ -18,8 +18,7 @@ * along with this program; if not, see . */ -#ifndef META_BACKGROUND_CONTENT_H -#define META_BACKGROUND_CONTENT_H +#pragma once #include @@ -63,5 +62,3 @@ void meta_background_content_set_rounded_clip_radius (MetaBackgroundContent *sel META_EXPORT void meta_background_content_set_rounded_clip_bounds (MetaBackgroundContent *self, const graphene_rect_t *bounds); - -#endif /* META_BACKGROUND_CONTENT_H */ diff --git a/src/meta/meta-background-group.h b/src/meta/meta-background-group.h index b43fcb94a..af44cc61a 100644 --- a/src/meta/meta-background-group.h +++ b/src/meta/meta-background-group.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef META_BACKGROUND_GROUP_H -#define META_BACKGROUND_GROUP_H +#pragma once #include "clutter/clutter.h" @@ -22,5 +21,3 @@ struct _MetaBackgroundGroupClass META_EXPORT ClutterActor *meta_background_group_new (void); - -#endif /* META_BACKGROUND_GROUP_H */ diff --git a/src/meta/meta-background-image.h b/src/meta/meta-background-image.h index 137a6ff8e..e6fecee91 100644 --- a/src/meta/meta-background-image.h +++ b/src/meta/meta-background-image.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef __META_BACKGROUND_IMAGE_H__ -#define __META_BACKGROUND_IMAGE_H__ +#pragma once #include #include @@ -65,5 +64,3 @@ MetaBackgroundImage *meta_background_image_cache_load (MetaBackgroundImageCache META_EXPORT void meta_background_image_cache_purge (MetaBackgroundImageCache *cache, GFile *file); - -#endif /* __META_BACKGROUND_IMAGE_H__ */ diff --git a/src/meta/meta-background.h b/src/meta/meta-background.h index 458b6c6f1..cb66544a4 100644 --- a/src/meta/meta-background.h +++ b/src/meta/meta-background.h @@ -18,8 +18,7 @@ * along with this program; if not, see . */ -#ifndef META_BACKGROUND_H -#define META_BACKGROUND_H +#pragma once #include @@ -71,5 +70,3 @@ void meta_background_set_blend (MetaBackground *self, GFile *file2, double blend_factor, GDesktopBackgroundStyle style); - -#endif /* META_BACKGROUND_H */ diff --git a/src/meta/meta-close-dialog.h b/src/meta/meta-close-dialog.h index 281b0ee24..a7c269991 100644 --- a/src/meta/meta-close-dialog.h +++ b/src/meta/meta-close-dialog.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_CLOSE_DIALOG_H -#define META_CLOSE_DIALOG_H +#pragma once #include #include @@ -61,5 +60,3 @@ gboolean meta_close_dialog_is_visible (MetaCloseDialog *dialog); META_EXPORT void meta_close_dialog_response (MetaCloseDialog *dialog, MetaCloseDialogResponse response); - -#endif /* META_CLOSE_DIALOG_H */ diff --git a/src/meta/meta-context.h b/src/meta/meta-context.h index 5031892df..e19a99315 100644 --- a/src/meta/meta-context.h +++ b/src/meta/meta-context.h @@ -18,8 +18,7 @@ * */ -#ifndef META_CONTEXT_H -#define META_CONTEXT_H +#pragma once #include @@ -104,5 +103,3 @@ gboolean meta_context_raise_rlimit_nofile (MetaContext *context, META_EXPORT gboolean meta_context_restore_rlimit_nofile (MetaContext *context, GError **error); - -#endif /* META_CONTEXT_H */ diff --git a/src/meta/meta-cursor-tracker.h b/src/meta/meta-cursor-tracker.h index fb4750c66..4631f508d 100644 --- a/src/meta/meta-cursor-tracker.h +++ b/src/meta/meta-cursor-tracker.h @@ -19,8 +19,7 @@ * Author: Giovanni Campagna */ -#ifndef META_CURSOR_TRACKER_H -#define META_CURSOR_TRACKER_H +#pragma once #include @@ -62,5 +61,3 @@ gboolean meta_cursor_tracker_get_pointer_visible (MetaCursorTracker *track META_EXPORT void meta_cursor_tracker_set_pointer_visible (MetaCursorTracker *tracker, gboolean visible); - -#endif diff --git a/src/meta/meta-dnd.h b/src/meta/meta-dnd.h index 2b2be1029..f68b4849b 100644 --- a/src/meta/meta-dnd.h +++ b/src/meta/meta-dnd.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_DND_H -#define META_DND_H +#pragma once #include #include @@ -30,5 +29,3 @@ META_EXPORT G_DECLARE_FINAL_TYPE (MetaDnd, meta_dnd, META, DND, GObject) - -#endif /* META_DND_H */ diff --git a/src/meta/meta-enum-types.h.in b/src/meta/meta-enum-types.h.in index bee0196de..ac640f0e6 100644 --- a/src/meta/meta-enum-types.h.in +++ b/src/meta/meta-enum-types.h.in @@ -1,6 +1,5 @@ /*** BEGIN file-header ***/ -#ifndef __META_ENUM_TYPES_H__ -#define __META_ENUM_TYPES_H__ +#pragma once #include #include @@ -16,7 +15,6 @@ G_BEGIN_DECLS /*** BEGIN file-tail ***/ G_END_DECLS -#endif /* !__MUTTER_ENUM_TYPES_H__ */ /*** END file-tail ***/ /*** BEGIN value-header ***/ diff --git a/src/meta/meta-enums.h b/src/meta/meta-enums.h index da36284f7..cd31d15f7 100644 --- a/src/meta/meta-enums.h +++ b/src/meta/meta-enums.h @@ -18,8 +18,7 @@ * */ -#ifndef META_ENUMS_H -#define META_ENUMS_H +#pragma once typedef enum _MetaCompositorType { @@ -415,5 +414,3 @@ typedef enum META_A11Y_STICKY_KEYS_BEEP = 1 << 12, META_A11Y_FEATURE_STATE_CHANGE_BEEP = 1 << 13, } MetaKeyboardA11yFlags; - -#endif /* META_ENUMS_H */ diff --git a/src/meta/meta-idle-monitor.h b/src/meta/meta-idle-monitor.h index 8cc9bf2bf..e43fdaa81 100644 --- a/src/meta/meta-idle-monitor.h +++ b/src/meta/meta-idle-monitor.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_IDLE_MONITOR_H -#define META_IDLE_MONITOR_H +#pragma once #include #include @@ -52,5 +51,3 @@ void meta_idle_monitor_remove_watch (MetaIdleMonitor META_EXPORT gint64 meta_idle_monitor_get_idletime (MetaIdleMonitor *monitor); - -#endif diff --git a/src/meta/meta-inhibit-shortcuts-dialog.h b/src/meta/meta-inhibit-shortcuts-dialog.h index 4e34f1701..9c4248f13 100644 --- a/src/meta/meta-inhibit-shortcuts-dialog.h +++ b/src/meta/meta-inhibit-shortcuts-dialog.h @@ -16,8 +16,7 @@ * */ -#ifndef META_INHIBIT_SHORTCUTS_DIALOG_H -#define META_INHIBIT_SHORTCUTS_DIALOG_H +#pragma once #include #include @@ -51,5 +50,3 @@ void meta_inhibit_shortcuts_dialog_hide (MetaInhibitShortcutsDialog *dialog); META_EXPORT void meta_inhibit_shortcuts_dialog_response (MetaInhibitShortcutsDialog *dialog, MetaInhibitShortcutsDialogResponse response); - -#endif /* META_INHIBIT_SHORTCUTS_DIALOG_H */ diff --git a/src/meta/meta-later.h b/src/meta/meta-later.h index 6f8bb78a4..8d793f5c9 100644 --- a/src/meta/meta-later.h +++ b/src/meta/meta-later.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_LATER_H -#define META_LATER_H +#pragma once #include @@ -57,5 +56,3 @@ unsigned int meta_laters_add (MetaLaters *laters, META_EXPORT void meta_laters_remove (MetaLaters *laters, unsigned int later_id); - -#endif /* META_LATER_H */ diff --git a/src/meta/meta-launch-context.h b/src/meta/meta-launch-context.h index b719f0e07..1d0693973 100644 --- a/src/meta/meta-launch-context.h +++ b/src/meta/meta-launch-context.h @@ -18,8 +18,8 @@ * * Author: Carlos Garnacho */ -#ifndef META_LAUNCH_CONTEXT_H -#define META_LAUNCH_CONTEXT_H + +#pragma once #include @@ -35,5 +35,3 @@ void meta_launch_context_set_timestamp (MetaLaunchContext *context, META_EXPORT void meta_launch_context_set_workspace (MetaLaunchContext *context, MetaWorkspace *workspace); - -#endif /* META_LAUNCH_CONTEXT_H */ diff --git a/src/meta/meta-monitor-manager.h b/src/meta/meta-monitor-manager.h index 3aa5df5c9..465f8a914 100644 --- a/src/meta/meta-monitor-manager.h +++ b/src/meta/meta-monitor-manager.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_MONITOR_MANAGER_H -#define META_MONITOR_MANAGER_H +#pragma once #include @@ -61,5 +60,3 @@ int meta_monitor_manager_get_display_configuration_timeout (MetaMonitorManager * META_EXPORT gboolean meta_monitor_manager_get_panel_orientation_managed (MetaMonitorManager *manager); - -#endif /* META_MONITOR_MANAGER_H */ diff --git a/src/meta/meta-multi-texture-format.h b/src/meta/meta-multi-texture-format.h index 21afc02e0..116261cdb 100644 --- a/src/meta/meta-multi-texture-format.h +++ b/src/meta/meta-multi-texture-format.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_MULTI_TEXTURE_FORMAT_H -#define META_MULTI_TEXTURE_FORMAT_H +#pragma once #include @@ -42,5 +41,3 @@ typedef enum _MetaMultiTextureFormat } MetaMultiTextureFormat; G_END_DECLS - -#endif /* META_MULTI_TEXTURE_FORMAT_H */ diff --git a/src/meta/meta-multi-texture.h b/src/meta/meta-multi-texture.h index 2561f0ea5..7dd27eab7 100644 --- a/src/meta/meta-multi-texture.h +++ b/src/meta/meta-multi-texture.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_MULTI_TEXTURE_H -#define META_MULTI_TEXTURE_H +#pragma once #include #include @@ -69,5 +68,3 @@ META_EXPORT char * meta_multi_texture_to_string (MetaMultiTexture *multi_texture); G_END_DECLS - -#endif /* META_MULTI_TEXTURE_H */ diff --git a/src/meta/meta-plugin.h b/src/meta/meta-plugin.h index 663a75fa9..24abbd3e7 100644 --- a/src/meta/meta-plugin.h +++ b/src/meta/meta-plugin.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_PLUGIN_H_ -#define META_PLUGIN_H_ +#pragma once #include #include @@ -340,5 +339,3 @@ void _meta_plugin_set_compositor (MetaPlugin *plugin, MetaCompositor *compositor /* XXX: Putting this in here so it's in the public header. */ META_EXPORT void meta_plugin_manager_set_plugin_type (GType gtype); - -#endif /* META_PLUGIN_H_ */ diff --git a/src/meta/meta-remote-access-controller.h b/src/meta/meta-remote-access-controller.h index 81b717eac..411f79c46 100644 --- a/src/meta/meta-remote-access-controller.h +++ b/src/meta/meta-remote-access-controller.h @@ -18,8 +18,7 @@ * */ -#ifndef META_REMOTE_ACCESS_CONTROLLER_H -#define META_REMOTE_ACCESS_CONTROLLER_H +#pragma once #include @@ -59,5 +58,3 @@ void meta_remote_access_controller_inhibit_remote_access (MetaRemoteAccessContro META_EXPORT void meta_remote_access_controller_uninhibit_remote_access (MetaRemoteAccessController *controller); - -#endif /* META_REMOTE_ACCESS_CONTROLLER_H */ diff --git a/src/meta/meta-selection-source-memory.h b/src/meta/meta-selection-source-memory.h index b72e12762..f0ab5527d 100644 --- a/src/meta/meta-selection-source-memory.h +++ b/src/meta/meta-selection-source-memory.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_MEMORY_SELECTION_SOURCE_H -#define META_MEMORY_SELECTION_SOURCE_H +#pragma once #include "meta/meta-selection-source.h" @@ -35,5 +34,3 @@ G_DECLARE_FINAL_TYPE (MetaSelectionSourceMemory, META_EXPORT MetaSelectionSource * meta_selection_source_memory_new (const char *mimetype, GBytes *content); - -#endif /* META_SELECTION_SOURCE_MEMORY_H */ diff --git a/src/meta/meta-selection-source.h b/src/meta/meta-selection-source.h index a341bede1..596d06a3b 100644 --- a/src/meta/meta-selection-source.h +++ b/src/meta/meta-selection-source.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_SELECTION_SOURCE_H -#define META_SELECTION_SOURCE_H +#pragma once #include @@ -81,5 +80,3 @@ GList * meta_selection_source_get_mimetypes (MetaSelectionSource *source); META_EXPORT gboolean meta_selection_source_is_active (MetaSelectionSource *source); - -#endif /* META_SELECTION_SOURCE_H */ diff --git a/src/meta/meta-selection.h b/src/meta/meta-selection.h index ef86dce1d..2451e1acd 100644 --- a/src/meta/meta-selection.h +++ b/src/meta/meta-selection.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_SELECTION_H -#define META_SELECTION_H +#pragma once #include @@ -66,5 +65,3 @@ META_EXPORT gboolean meta_selection_transfer_finish (MetaSelection *selection, GAsyncResult *result, GError **error); - -#endif /* META_SELECTION_H */ diff --git a/src/meta/meta-settings.h b/src/meta/meta-settings.h index 5683d7c1d..26b6b70d8 100644 --- a/src/meta/meta-settings.h +++ b/src/meta/meta-settings.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_SETTINGS_H -#define META_SETTINGS_H +#pragma once #include #include @@ -30,5 +29,3 @@ int meta_settings_get_ui_scaling_factor (MetaSettings *settings); META_EXPORT int meta_settings_get_font_dpi (MetaSettings *settings); - -#endif /* META_SETTINGS_H */ diff --git a/src/meta/meta-shadow-factory.h b/src/meta/meta-shadow-factory.h index 3ca5e7408..f01198ba7 100644 --- a/src/meta/meta-shadow-factory.h +++ b/src/meta/meta-shadow-factory.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef __META_SHADOW_FACTORY_H__ -#define __META_SHADOW_FACTORY_H__ +#pragma once #include @@ -134,5 +133,3 @@ MetaShadow *meta_shadow_factory_get_shadow (MetaShadowFactory *factory, int height, const char *class_name, gboolean focused); - -#endif /* __META_SHADOW_FACTORY_H__ */ diff --git a/src/meta/meta-shaped-texture.h b/src/meta/meta-shaped-texture.h index 1714addf6..330220d8e 100644 --- a/src/meta/meta-shaped-texture.h +++ b/src/meta/meta-shaped-texture.h @@ -21,8 +21,7 @@ * along with this program; if not, see . */ -#ifndef __META_SHAPED_TEXTURE_H__ -#define __META_SHAPED_TEXTURE_H__ +#pragma once #include @@ -57,5 +56,3 @@ cairo_surface_t * meta_shaped_texture_get_image (MetaShapedTexture *stex, cairo_rectangle_int_t *clip); G_END_DECLS - -#endif /* __META_SHAPED_TEXTURE_H__ */ diff --git a/src/meta/meta-sound-player.h b/src/meta/meta-sound-player.h index 4183689cd..846c98fc7 100644 --- a/src/meta/meta-sound-player.h +++ b/src/meta/meta-sound-player.h @@ -18,8 +18,8 @@ * * Author: Carlos Garnacho */ -#ifndef META_SOUND_PLAYER_H -#define META_SOUND_PLAYER_H + +#pragma once #include @@ -42,5 +42,3 @@ void meta_sound_player_play_from_file (MetaSoundPlayer *player, GFile *file, const char *description, GCancellable *cancellable); - -#endif /* META_SOUND_PLAYER_H */ diff --git a/src/meta/meta-stage.h b/src/meta/meta-stage.h index afab102e5..83dc82541 100644 --- a/src/meta/meta-stage.h +++ b/src/meta/meta-stage.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_STAGE_H -#define META_STAGE_H +#pragma once #include "clutter/clutter.h" @@ -30,5 +29,3 @@ META_EXPORT G_DECLARE_FINAL_TYPE (MetaStage, meta_stage, META, STAGE, ClutterStage) G_END_DECLS - -#endif /* META_STAGE_H */ diff --git a/src/meta/meta-startup-notification.h b/src/meta/meta-startup-notification.h index 0bda6fead..372b4cf2e 100644 --- a/src/meta/meta-startup-notification.h +++ b/src/meta/meta-startup-notification.h @@ -16,8 +16,7 @@ * along with this program; if not, see . */ -#ifndef META_STARTUP_NOTIFICATION_H -#define META_STARTUP_NOTIFICATION_H +#pragma once #include @@ -69,5 +68,3 @@ const char * meta_startup_sequence_get_wmclass (MetaStartupSequence *seq) META_EXPORT void meta_startup_sequence_complete (MetaStartupSequence *seq); - -#endif /* META_STARTUP_NOTIFICATION_H */ diff --git a/src/meta/meta-wayland-client.h b/src/meta/meta-wayland-client.h index 0e9160f93..e93542ae6 100644 --- a/src/meta/meta-wayland-client.h +++ b/src/meta/meta-wayland-client.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_CLIENT_H -#define META_WAYLAND_CLIENT_H +#pragma once #include #include @@ -65,4 +64,3 @@ void meta_wayland_client_show_in_window_list (MetaWaylandClient *client, G_END_DECLS -#endif /* META_WAYLAND_CLIENT_H */ diff --git a/src/meta/meta-wayland-compositor.h b/src/meta/meta-wayland-compositor.h index 2a6fe652d..a66a1bdaf 100644 --- a/src/meta/meta-wayland-compositor.h +++ b/src/meta/meta-wayland-compositor.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_COMPOSITOR_H -#define META_WAYLAND_COMPOSITOR_H +#pragma once #include #include @@ -41,5 +40,3 @@ META_EXPORT struct wl_display *meta_wayland_compositor_get_wayland_display (MetaWaylandCompositor *compositor); G_END_DECLS - -#endif /* META_WAYLAND_COMPOSITOR_H */ diff --git a/src/meta/meta-window-actor.h b/src/meta/meta-window-actor.h index 342995fb0..f0c17a096 100644 --- a/src/meta/meta-window-actor.h +++ b/src/meta/meta-window-actor.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_WINDOW_ACTOR_H_ -#define META_WINDOW_ACTOR_H_ +#pragma once #include "clutter/clutter.h" #include "meta/compositor.h" @@ -68,5 +67,3 @@ typedef enum META_SHADOW_MODE_FORCED_OFF, META_SHADOW_MODE_FORCED_ON, } MetaShadowMode; - -#endif /* META_WINDOW_ACTOR_H */ diff --git a/src/meta/meta-window-group.h b/src/meta/meta-window-group.h index cfc487e7c..f52162cab 100644 --- a/src/meta/meta-window-group.h +++ b/src/meta/meta-window-group.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef META_WINDOW_GROUP_H -#define META_WINDOW_GROUP_H +#pragma once #include "clutter/clutter.h" @@ -12,5 +11,3 @@ G_DECLARE_FINAL_TYPE (MetaWindowGroup, meta_window_group, META, WINDOW_GROUP, ClutterActor) - -#endif /* META_WINDOW_GROUP_H */ diff --git a/src/meta/meta-window-shape.h b/src/meta/meta-window-shape.h index 333dcb74b..fd2dd5fad 100644 --- a/src/meta/meta-window-shape.h +++ b/src/meta/meta-window-shape.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef __META_WINDOW_SHAPE_H__ -#define __META_WINDOW_SHAPE_H__ +#pragma once #include #include @@ -72,6 +71,3 @@ META_EXPORT cairo_region_t *meta_window_shape_to_region (MetaWindowShape *shape, int center_width, int center_height); - -#endif /* __META_WINDOW_SHAPE_H __*/ - diff --git a/src/meta/meta-workspace-manager.h b/src/meta/meta-workspace-manager.h index 92cd68191..6257448cd 100644 --- a/src/meta/meta-workspace-manager.h +++ b/src/meta/meta-workspace-manager.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_WORKSPACE_MANAGER_H -#define META_WORKSPACE_MANAGER_H +#pragma once #include @@ -75,4 +74,3 @@ void meta_workspace_manager_override_workspace_layout (MetaWorkspaceManager *wor gboolean vertical_layout, int n_rows, int n_columns); -#endif /* META_WORKSPACE_MANAGER_H */ diff --git a/src/meta/meta-x11-display.h b/src/meta/meta-x11-display.h index 68d157b79..64d1ca4ad 100644 --- a/src/meta/meta-x11-display.h +++ b/src/meta/meta-x11-display.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_X11_DISPLAY_H -#define META_X11_DISPLAY_H +#pragma once #include #include @@ -59,4 +58,3 @@ void meta_x11_display_remove_event_func (MetaX11Display *x11_display, META_EXPORT void meta_x11_display_redirect_windows (MetaX11Display *x11_display, MetaDisplay *display); -#endif /* META_X11_DISPLAY_H */ diff --git a/src/meta/meta-x11-errors.h b/src/meta/meta-x11-errors.h index ec9fa5c71..5488b7588 100644 --- a/src/meta/meta-x11-errors.h +++ b/src/meta/meta-x11-errors.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_ERRORS_H -#define META_ERRORS_H +#pragma once #include @@ -36,6 +35,3 @@ void meta_x11_error_trap_pop (MetaX11Display *x11_display); /* returns X error code, or 0 for no error */ META_EXPORT int meta_x11_error_trap_pop_with_return (MetaX11Display *x11_display); - - -#endif diff --git a/src/meta/prefs.h b/src/meta/prefs.h index bd975dde5..3011c5121 100644 --- a/src/meta/prefs.h +++ b/src/meta/prefs.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_PREFS_H -#define META_PREFS_H +#pragma once /* This header is a "common" one between the UI and core side */ #include @@ -479,5 +478,3 @@ GDesktopVisualBellType meta_prefs_get_visual_bell_type (void); META_EXPORT unsigned int meta_prefs_get_check_alive_timeout (void); - -#endif diff --git a/src/meta/types.h b/src/meta/types.h index 489d7e291..cbe2a9a3d 100644 --- a/src/meta/types.h +++ b/src/meta/types.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_TYPES_H -#define META_TYPES_H +#pragma once typedef struct _MetaBackend MetaBackend; typedef struct _MetaContext MetaContext; @@ -39,5 +38,3 @@ typedef struct _MetaSettings MetaSettings; typedef struct _MetaWorkspaceManager MetaWorkspaceManager; typedef struct _MetaSelection MetaSelection; - -#endif diff --git a/src/meta/util.h b/src/meta/util.h index 150f68c2a..2d3122a73 100644 --- a/src/meta/util.h +++ b/src/meta/util.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_UTIL_H -#define META_UTIL_H +#pragma once #include #include @@ -230,5 +229,3 @@ MetaDebugPaintFlag meta_get_debug_paint_flags (void); META_EXPORT char * meta_accelerator_name (ClutterModifierType accelerator_mods, unsigned int accelerator_key); - -#endif /* META_UTIL_H */ diff --git a/src/meta/window.h b/src/meta/window.h index a76524c0d..b57634ae5 100644 --- a/src/meta/window.h +++ b/src/meta/window.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_WINDOW_H -#define META_WINDOW_H +#pragma once #include #include @@ -445,5 +444,3 @@ MetaWindowClientType meta_window_get_client_type (MetaWindow *window); META_EXPORT gboolean meta_window_has_pointer (MetaWindow *window); - -#endif diff --git a/src/meta/workspace.h b/src/meta/workspace.h index 99aebee5d..96ebeb6c9 100644 --- a/src/meta/workspace.h +++ b/src/meta/workspace.h @@ -18,8 +18,7 @@ * along with this program; if not, see . */ -#ifndef META_WORKSPACE_H -#define META_WORKSPACE_H +#pragma once #include #include @@ -69,5 +68,3 @@ void meta_workspace_set_builtin_struts (MetaWorkspace *workspace, META_EXPORT MetaWorkspace* meta_workspace_get_neighbor (MetaWorkspace *workspace, MetaMotionDirection direction); - -#endif diff --git a/src/tests/boxes-tests.h b/src/tests/boxes-tests.h index 9f3b778b7..00c9ec571 100644 --- a/src/tests/boxes-tests.h +++ b/src/tests/boxes-tests.h @@ -15,9 +15,6 @@ * along with this program; if not, see . */ -#ifndef BOXES_TESTS_H -#define BOXES_TESTS_H +#pragma once void init_boxes_tests (void); - -#endif /* BOXES_TESTS_H */ diff --git a/src/tests/clutter-test-utils.h b/src/tests/clutter-test-utils.h index 75a91565a..77f462d66 100644 --- a/src/tests/clutter-test-utils.h +++ b/src/tests/clutter-test-utils.h @@ -21,8 +21,7 @@ #include "config.h" -#ifndef __CLUTTER_TEST_UTILS_H__ -#define __CLUTTER_TEST_UTILS_H__ +#pragma once #define __CLUTTER_H_INSIDE__ @@ -174,5 +173,3 @@ gboolean clutter_test_check_color_at_point (ClutterActor ClutterColor *result); G_END_DECLS - -#endif /* __CLUTTER_TEST_UTILS_H__ */ diff --git a/src/tests/cogl-test-utils.h b/src/tests/cogl-test-utils.h index 66e80c7ce..96d863fd7 100644 --- a/src/tests/cogl-test-utils.h +++ b/src/tests/cogl-test-utils.h @@ -18,8 +18,7 @@ * */ -#ifndef COGL_TEST_UTILS_H -#define COGL_TEST_UTILS_H +#pragma once #include "meta-test/meta-context-test.h" @@ -298,5 +297,3 @@ test_utils_is_pot (unsigned int number) /* Make sure there is only one bit set */ return (number & (number - 1)) == 0; } - -#endif /* COGL_TEST_UTILS_H */ diff --git a/src/tests/drm-mock/drm-mock.h b/src/tests/drm-mock/drm-mock.h index 7e6c291c1..3bc111f75 100644 --- a/src/tests/drm-mock/drm-mock.h +++ b/src/tests/drm-mock/drm-mock.h @@ -23,8 +23,7 @@ * */ -#ifndef DRM_MOCK_H -#define DRM_MOCK_H +#pragma once #include #include @@ -61,5 +60,3 @@ void drm_mock_set_resource_filter (DrmMockCallFilter call_filter, DRM_MOCK_EXPORT void drm_mock_unset_resource_filter (DrmMockCallFilter call_filter); - -#endif /* DRM_MOCK_H */ diff --git a/src/tests/hdr-metadata-unit-tests.h b/src/tests/hdr-metadata-unit-tests.h index feee8209d..e343c36df 100644 --- a/src/tests/hdr-metadata-unit-tests.h +++ b/src/tests/hdr-metadata-unit-tests.h @@ -18,9 +18,6 @@ * Author: Sebastian Wick */ -#ifndef HDR_METADATA_UNIT_TESTS_H -#define HDR_METADATA_UNIT_TESTS_H +#pragma once void init_hdr_metadata_tests (void); - -#endif /* HDR_METADATA_UNIT_TESTS_H */ diff --git a/src/tests/meta-backend-test.h b/src/tests/meta-backend-test.h index abf87aeb3..f25b2586b 100644 --- a/src/tests/meta-backend-test.h +++ b/src/tests/meta-backend-test.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_BACKEND_TEST_H -#define META_BACKEND_TEST_H +#pragma once #include "backends/x11/nested/meta-backend-x11-nested.h" @@ -43,6 +42,3 @@ ClutterInputDevice * meta_backend_test_add_test_device (MetaBackendTest * META_EXPORT_TEST void meta_backend_test_remove_device (MetaBackendTest *backend, ClutterInputDevice *device); - - -#endif /* META_BACKEND_TEST_H */ diff --git a/src/tests/meta-gpu-test.h b/src/tests/meta-gpu-test.h index 46bbc80e2..9cece3d19 100644 --- a/src/tests/meta-gpu-test.h +++ b/src/tests/meta-gpu-test.h @@ -15,12 +15,9 @@ * along with this program; if not, see . */ -#ifndef META_GPU_TEST_H -#define META_GPU_TEST_H +#pragma once #include "backends/meta-gpu.h" #define META_TYPE_GPU_TEST (meta_gpu_test_get_type ()) G_DECLARE_FINAL_TYPE (MetaGpuTest, meta_gpu_test, META, GPU_TEST, MetaGpu) - -#endif /* META_GPU_TEST_H */ diff --git a/src/tests/meta-kms-test-utils.h b/src/tests/meta-kms-test-utils.h index e28a1425f..a0050112f 100644 --- a/src/tests/meta-kms-test-utils.h +++ b/src/tests/meta-kms-test-utils.h @@ -18,8 +18,7 @@ * */ -#ifndef META_KMS_TEST_UTILS_H -#define META_KMS_TEST_UTILS_H +#pragma once #include "backends/native/meta-drm-buffer.h" #include "backends/native/meta-kms-types.h" @@ -42,5 +41,3 @@ MetaDrmBuffer * meta_create_test_mode_dumb_buffer (MetaKmsDevice *device, MetaFixed16Rectangle meta_get_mode_fixed_rect_16 (MetaKmsMode *mode); MetaRectangle meta_get_mode_rect (MetaKmsMode *mode); - -#endif /* META_KMS_TEST_UTILS_H */ diff --git a/src/tests/meta-monitor-manager-test.h b/src/tests/meta-monitor-manager-test.h index d19b3ac75..0b8c5fb6c 100644 --- a/src/tests/meta-monitor-manager-test.h +++ b/src/tests/meta-monitor-manager-test.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_MONITOR_MANAGER_TEST_H -#define META_MONITOR_MANAGER_TEST_H +#pragma once #include "backends/meta-crtc.h" #include "backends/meta-monitor-manager-private.h" @@ -93,5 +92,3 @@ void meta_crtc_test_disable_gamma_lut (MetaCrtcTest *crtc_test); META_EXPORT void meta_monitor_manager_test_set_layout_mode (MetaMonitorManagerTest *manager_test, MetaLogicalMonitorLayoutMode layout_mode); - -#endif /* META_MONITOR_MANAGER_TEST_H */ diff --git a/src/tests/meta-monitor-test-utils.h b/src/tests/meta-monitor-test-utils.h index 278a089fa..1039f99d5 100644 --- a/src/tests/meta-monitor-test-utils.h +++ b/src/tests/meta-monitor-test-utils.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef MONITOR_TEST_UTILS_H -#define MONITOR_TEST_UTILS_H +#pragma once #include @@ -241,5 +240,3 @@ void meta_wait_for_orientation (MetaOrientationManager *orientation_manager, META_EXPORT void meta_wait_for_possible_orientation_change (MetaOrientationManager *orientation_manager, unsigned int *times_signalled_out); - -#endif /* MONITOR_TEST_UTILS_H */ diff --git a/src/tests/meta-ref-test.h b/src/tests/meta-ref-test.h index b61179cd0..ad0500dc2 100644 --- a/src/tests/meta-ref-test.h +++ b/src/tests/meta-ref-test.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef META_REF_TEST_H -#define META_REF_TEST_H +#pragma once #include @@ -37,5 +36,3 @@ void meta_ref_test_verify_view (ClutterStageView *view, META_EXPORT MetaReftestFlag meta_ref_test_determine_ref_test_flag (void); - -#endif /* META_REF_TEST_H */ diff --git a/src/tests/meta-sensors-proxy-mock.h b/src/tests/meta-sensors-proxy-mock.h index b32c5868d..a7fb1624c 100644 --- a/src/tests/meta-sensors-proxy-mock.h +++ b/src/tests/meta-sensors-proxy-mock.h @@ -18,8 +18,7 @@ * Author: Marco Trevisan */ -#ifndef META_SENSORS_PROXY_MOCK_H -#define META_SENSORS_PROXY_MOCK_H +#pragma once #include "backends/meta-orientation-manager.h" @@ -37,5 +36,3 @@ void meta_sensors_proxy_mock_set_property (MetaSensorsProxyMock *proxy, META_EXPORT void meta_sensors_proxy_mock_set_orientation (MetaSensorsProxyMock *proxy, MetaOrientation orientation); - -#endif /* META_SENSORS_PROXY_MOCK_H */ diff --git a/src/tests/meta-test-utils-private.h b/src/tests/meta-test-utils-private.h index 2b36c58b4..6720f6f38 100644 --- a/src/tests/meta-test-utils-private.h +++ b/src/tests/meta-test-utils-private.h @@ -15,12 +15,9 @@ * along with this program; if not, see . */ -#ifndef META_TEST_UTILS_PRIVATE_H -#define META_TEST_UTILS_PRIVATE_H +#pragma once #include "tests/meta-test-utils.h" void meta_ensure_test_client_path (int argc, char **argv); - -#endif /* META_TEST_UTILS_PRIVATE_H */ diff --git a/src/tests/meta-test-utils.h b/src/tests/meta-test-utils.h index e89d016df..391d67332 100644 --- a/src/tests/meta-test-utils.h +++ b/src/tests/meta-test-utils.h @@ -17,8 +17,7 @@ * along with this program; if not, see . */ -#ifndef META_TEST_UTILS_H -#define META_TEST_UTILS_H +#pragma once #include #include @@ -129,5 +128,3 @@ MetaVirtualMonitor * meta_create_test_monitor (MetaContext *context, META_EXPORT void meta_flush_input (MetaContext *context); - -#endif /* TEST_UTILS_H */ diff --git a/src/tests/meta-test/meta-context-test.h b/src/tests/meta-test/meta-context-test.h index 9217ec20c..caaf3b1bb 100644 --- a/src/tests/meta-test/meta-context-test.h +++ b/src/tests/meta-test/meta-context-test.h @@ -18,8 +18,7 @@ * */ -#ifndef META_CONTEXT_TEST_H -#define META_CONTEXT_TEST_H +#pragma once #include #include @@ -60,5 +59,3 @@ int meta_context_test_run_tests (MetaContextTest *context_test, META_EXPORT void meta_context_test_wait_for_x11_display (MetaContextTest *context_test); - -#endif /* META_CONTEXT_TEST_H */ diff --git a/src/tests/meta-test/meta-test-monitor.h b/src/tests/meta-test/meta-test-monitor.h index 4c130a4d0..86d7b7e77 100644 --- a/src/tests/meta-test/meta-test-monitor.h +++ b/src/tests/meta-test/meta-test-monitor.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_TEST_MONITOR_H -#define META_TEST_MONITOR_H +#pragma once #include #include @@ -37,5 +36,3 @@ MetaTestMonitor * meta_test_monitor_new (MetaContext *context, META_EXPORT void meta_test_monitor_destroy (MetaTestMonitor *test_monitor); - -#endif /* META_TEST_MONITOR_H */ diff --git a/src/tests/meta-thread-impl-test.h b/src/tests/meta-thread-impl-test.h index b422236f5..5dfc9c62b 100644 --- a/src/tests/meta-thread-impl-test.h +++ b/src/tests/meta-thread-impl-test.h @@ -18,8 +18,7 @@ * */ -#ifndef META_THREAD_IMPL_TEST_H -#define META_THREAD_IMPL_TEST_H +#pragma once #include "backends/native/meta-thread-impl.h" @@ -27,5 +26,3 @@ G_DECLARE_FINAL_TYPE (MetaThreadImplTest, meta_thread_impl_test, META, THREAD_IMPL_TEST, MetaThreadImpl) - -#endif /* META_THREAD_IMPL_TEST_H */ diff --git a/src/tests/meta-thread-test.h b/src/tests/meta-thread-test.h index e9f128a01..18e0c2502 100644 --- a/src/tests/meta-thread-test.h +++ b/src/tests/meta-thread-test.h @@ -18,8 +18,7 @@ * */ -#ifndef META_THREAD_TEST_H -#define META_THREAD_TEST_H +#pragma once #include "backends/native/meta-thread.h" @@ -27,5 +26,3 @@ G_DECLARE_FINAL_TYPE (MetaThreadTest, meta_thread_test, META, THREAD_TEST, MetaThread) - -#endif /* META_THREAD_TEST_H */ diff --git a/src/tests/meta-wayland-test-driver.h b/src/tests/meta-wayland-test-driver.h index dbd6ab82b..852e91c7b 100644 --- a/src/tests/meta-wayland-test-driver.h +++ b/src/tests/meta-wayland-test-driver.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_WAYLAND_TEST_DRIVER_H -#define META_WAYLAND_TEST_DRIVER_H +#pragma once #include "wayland/meta-wayland.h" @@ -36,5 +35,3 @@ void meta_wayland_test_driver_set_property (MetaWaylandTestDriver *test_driver, void meta_wayland_test_driver_wait_for_sync_point (MetaWaylandTestDriver *test_driver, unsigned int sync_point); - -#endif /* META_WAYLAND_TEST_DRIVER_H */ diff --git a/src/tests/meta-wayland-test-utils.h b/src/tests/meta-wayland-test-utils.h index 3422b5d21..8faa62090 100644 --- a/src/tests/meta-wayland-test-utils.h +++ b/src/tests/meta-wayland-test-utils.h @@ -15,8 +15,7 @@ * along with this program; if not, see . */ -#ifndef META_WAYLAND_TEST_UTILS_H -#define META_WAYLAND_TEST_UTILS_H +#pragma once #include "meta/meta-context.h" @@ -32,5 +31,3 @@ MetaWindow * meta_find_client_window (MetaContext *context, MetaWindow * meta_wait_for_client_window (MetaContext *context, const char *title); - -#endif /* META_WAYLAND_TEST_UTILS_H */ diff --git a/src/tests/monitor-config-migration-unit-tests.h b/src/tests/monitor-config-migration-unit-tests.h index a8d18de9a..7dfbd92f5 100644 --- a/src/tests/monitor-config-migration-unit-tests.h +++ b/src/tests/monitor-config-migration-unit-tests.h @@ -17,9 +17,6 @@ * along with this program; if not, see . */ -#ifndef MONITOR_CONFIG_MIGRATION_UNIT_TESTS_H -#define MONITOR_CONFIG_MIGRATION_UNIT_TESTS_H +#pragma once void init_monitor_config_migration_tests (void); - -#endif /* MONITOR_CONFIG_MIGRATION_UNIT_TESTS_H */ diff --git a/src/tests/monitor-store-unit-tests.h b/src/tests/monitor-store-unit-tests.h index 2e9496d32..2a19b8038 100644 --- a/src/tests/monitor-store-unit-tests.h +++ b/src/tests/monitor-store-unit-tests.h @@ -17,9 +17,6 @@ * along with this program; if not, see . */ -#ifndef MONITOR_STORE_UNIT_TESTS_H -#define MONITOR_STORE_UNIT_TESTS_H +#pragma once void init_monitor_store_tests (void); - -#endif /* MONITOR_STORE_UNIT_TESTS_H */ diff --git a/src/tests/monitor-transform-tests.h b/src/tests/monitor-transform-tests.h index f6d019132..084e28477 100644 --- a/src/tests/monitor-transform-tests.h +++ b/src/tests/monitor-transform-tests.h @@ -15,9 +15,6 @@ * along with this program; if not, see . */ -#ifndef MONITOR_TRANSFORM_UNIT_TESTS_H -#define MONITOR_TRANSFORM_UNIT_TESTS_H +#pragma once void init_monitor_transform_tests (void); - -#endif /* MONITOR_TRANSFORM_TESTS_H */ diff --git a/src/tests/native-screen-cast.h b/src/tests/native-screen-cast.h index 3c79676c7..54e2404df 100644 --- a/src/tests/native-screen-cast.h +++ b/src/tests/native-screen-cast.h @@ -18,9 +18,6 @@ * */ -#ifndef NATIVE_SCREEN_CAST_H -#define NATIVE_SCREEN_CAST_H +#pragma once void init_screen_cast_tests (void); - -#endif /* NATIVE_SCREEN_CAST_H */ diff --git a/src/tests/native-virtual-monitor.h b/src/tests/native-virtual-monitor.h index 8c3cf35ea..1ea1e4900 100644 --- a/src/tests/native-virtual-monitor.h +++ b/src/tests/native-virtual-monitor.h @@ -18,11 +18,8 @@ * */ -#ifndef NATIVE_VIRTUAL_MONITOR_H -#define NATIVE_VIRTUAL_MONITOR_H +#pragma once typedef struct _MetaContext MetaContext; void init_virtual_monitor_tests (MetaContext *context); - -#endif /* NATIVE_VIRTUAL_MONITOR_H */ diff --git a/src/tests/orientation-manager-unit-tests.h b/src/tests/orientation-manager-unit-tests.h index df198c105..af82514ff 100644 --- a/src/tests/orientation-manager-unit-tests.h +++ b/src/tests/orientation-manager-unit-tests.h @@ -18,11 +18,8 @@ * Author: Marco Trevisan */ -#ifndef ORIENTATION_MANAGER_UNIT_TESTS_H -#define ORIENTATION_MANAGER_UNIT_TESTS_H +#pragma once #include "backends/meta-orientation-manager.h" void init_orientation_manager_tests (void); - -#endif /* ORIENTATION_MANAGER_UNIT_TESTS_H */ diff --git a/src/tests/unit-tests.h b/src/tests/unit-tests.h index 30f24979e..002d09b53 100644 --- a/src/tests/unit-tests.h +++ b/src/tests/unit-tests.h @@ -15,11 +15,8 @@ * along with this program; if not, see . */ -#ifndef UNIT_TESTS_H -#define UNIT_TESTS_H +#pragma once #include "meta/meta-context.h" extern MetaContext *test_context; - -#endif /* UNIT_TESTS_H */ diff --git a/src/tests/wayland-test-clients/wayland-test-client-utils.h b/src/tests/wayland-test-clients/wayland-test-client-utils.h index af5eb0e54..332964938 100644 --- a/src/tests/wayland-test-clients/wayland-test-client-utils.h +++ b/src/tests/wayland-test-clients/wayland-test-client-utils.h @@ -1,5 +1,4 @@ -#ifndef WAYLAND_TEST_CLIENT_UTILS_H -#define WAYLAND_TEST_CLIENT_UTILS_H +#pragma once #include #include @@ -97,5 +96,3 @@ void wait_for_view_verified (WaylandDisplay *display, void wait_for_sync_event (WaylandDisplay *display, uint32_t serial); - -#endif /* WAYLAND_TEST_CLIENT_UTILS_H */ diff --git a/src/wayland/meta-cursor-sprite-wayland.h b/src/wayland/meta-cursor-sprite-wayland.h index e0f0c0d4b..5fdf88b9d 100644 --- a/src/wayland/meta-cursor-sprite-wayland.h +++ b/src/wayland/meta-cursor-sprite-wayland.h @@ -16,8 +16,7 @@ * */ -#ifndef META_CURSOR_SPRITE_WAYLAND_H -#define META_CURSOR_SPRITE_WAYLAND_H +#pragma once #include @@ -33,5 +32,3 @@ MetaCursorSpriteWayland * meta_cursor_sprite_wayland_new (MetaWaylandSurface *su MetaCursorTracker *cursor_tracker); MetaWaylandBuffer * meta_cursor_sprite_wayland_get_buffer (MetaCursorSpriteWayland *sprite_wayland); - -#endif /* META_CURSOR_SPRITE_WAYLAND_H */ diff --git a/src/wayland/meta-pointer-confinement-wayland.h b/src/wayland/meta-pointer-confinement-wayland.h index 4f265779c..f6e7f18e1 100644 --- a/src/wayland/meta-pointer-confinement-wayland.h +++ b/src/wayland/meta-pointer-confinement-wayland.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_POINTER_CONFINEMENT_WAYLAND_H -#define META_POINTER_CONFINEMENT_WAYLAND_H +#pragma once #include @@ -52,5 +51,3 @@ void meta_pointer_confinement_wayland_enable (MetaPointerConfinementWayland *con void meta_pointer_confinement_wayland_disable (MetaPointerConfinementWayland *confinement); G_END_DECLS - -#endif /* META_CONFINEMENT_WAYLAND_H */ diff --git a/src/wayland/meta-pointer-lock-wayland.h b/src/wayland/meta-pointer-lock-wayland.h index d52aaa30d..fa142eafa 100644 --- a/src/wayland/meta-pointer-lock-wayland.h +++ b/src/wayland/meta-pointer-lock-wayland.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_POINTER_LOCK_WAYLAND_H -#define META_POINTER_LOCK_WAYLAND_H +#pragma once #include @@ -38,5 +37,3 @@ G_DECLARE_FINAL_TYPE (MetaPointerLockWayland, meta_pointer_lock_wayland, MetaPointerConfinementWayland *meta_pointer_lock_wayland_new (MetaWaylandPointerConstraint *constraint); G_END_DECLS - -#endif /* META_LOCK_WAYLAND_H */ diff --git a/src/wayland/meta-selection-source-wayland-private.h b/src/wayland/meta-selection-source-wayland-private.h index 38489530a..be0d1a99f 100644 --- a/src/wayland/meta-selection-source-wayland-private.h +++ b/src/wayland/meta-selection-source-wayland-private.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_SELECTION_SOURCE_WAYLAND_H -#define META_SELECTION_SOURCE_WAYLAND_H +#pragma once #include @@ -36,4 +35,3 @@ G_DECLARE_FINAL_TYPE (MetaSelectionSourceWayland, MetaSelectionSource * meta_selection_source_wayland_new (MetaWaylandDataSource *source); -#endif /* META_SELECTION_SOURCE_WAYLAND_H */ diff --git a/src/wayland/meta-wayland-activation.h b/src/wayland/meta-wayland-activation.h index ed4e67737..53cef4526 100644 --- a/src/wayland/meta-wayland-activation.h +++ b/src/wayland/meta-wayland-activation.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_ACTIVATION_H -#define META_WAYLAND_ACTIVATION_H +#pragma once #include #include @@ -30,5 +29,3 @@ void meta_wayland_activation_finalize (MetaWaylandCompositor *compositor); void meta_wayland_activation_init (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_ACTIVATION_H */ diff --git a/src/wayland/meta-wayland-actor-surface.h b/src/wayland/meta-wayland-actor-surface.h index c248adf95..d5e23075e 100644 --- a/src/wayland/meta-wayland-actor-surface.h +++ b/src/wayland/meta-wayland-actor-surface.h @@ -18,8 +18,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_ACTOR_SURFACE_H -#define META_WAYLAND_ACTOR_SURFACE_H +#pragma once #include "wayland/meta-wayland-surface.h" @@ -50,5 +49,3 @@ void meta_wayland_actor_surface_queue_frame_callbacks (MetaWaylandActorSurface * void meta_wayland_actor_surface_emit_frame_callbacks (MetaWaylandActorSurface *actor_surface, uint32_t timestamp_ms); - -#endif /* META_WAYLAND_ACTOR_SURFACE_H */ diff --git a/src/wayland/meta-wayland-buffer.h b/src/wayland/meta-wayland-buffer.h index 62459fd60..7a6ce179f 100644 --- a/src/wayland/meta-wayland-buffer.h +++ b/src/wayland/meta-wayland-buffer.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef META_WAYLAND_BUFFER_H -#define META_WAYLAND_BUFFER_H +#pragma once #include #include @@ -108,5 +107,3 @@ CoglScanout * meta_wayland_buffer_try_acquire_scanout (MetaWaylandBuff CoglOnscreen *onscreen); void meta_wayland_init_shm (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_BUFFER_H */ diff --git a/src/wayland/meta-wayland-client-private.h b/src/wayland/meta-wayland-client-private.h index 63623dfdd..8e98609e3 100644 --- a/src/wayland/meta-wayland-client-private.h +++ b/src/wayland/meta-wayland-client-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_CLIENT_PRIVATE_H -#define META_WAYLAND_CLIENT_PRIVATE_H +#pragma once #include @@ -42,5 +41,3 @@ void meta_wayland_client_assign_service_client_type (MetaWaylandClient *clie MetaServiceClientType service_client_type); MetaServiceClientType meta_wayland_client_get_service_client_type (MetaWaylandClient *client); - -#endif /* META_WAYLAND_CLIENT_PRIVATE_H */ diff --git a/src/wayland/meta-wayland-cursor-surface.h b/src/wayland/meta-wayland-cursor-surface.h index 05b344f04..cd83a17e7 100644 --- a/src/wayland/meta-wayland-cursor-surface.h +++ b/src/wayland/meta-wayland-cursor-surface.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_CURSOR_SURFACE_H -#define META_WAYLAND_CURSOR_SURFACE_H +#pragma once #include "backends/meta-cursor-renderer.h" #include "wayland/meta-wayland-surface.h" @@ -47,6 +46,3 @@ void meta_wayland_cursor_surface_get_hotspot (MetaWaylandCursor void meta_wayland_cursor_surface_set_renderer (MetaWaylandCursorSurface *cursor_surface, MetaCursorRenderer *renderer); MetaCursorRenderer * meta_wayland_cursor_surface_get_renderer (MetaWaylandCursorSurface *cursor_surface); - - -#endif /* META_WAYLAND_CURSOR_SURFACE_H */ diff --git a/src/wayland/meta-wayland-data-device-primary.h b/src/wayland/meta-wayland-data-device-primary.h index 46be07115..3ac00dba7 100644 --- a/src/wayland/meta-wayland-data-device-primary.h +++ b/src/wayland/meta-wayland-data-device-primary.h @@ -21,8 +21,7 @@ * OF THIS SOFTWARE. */ -#ifndef META_WAYLAND_DATA_DEVICE_PRIMARY_H -#define META_WAYLAND_DATA_DEVICE_PRIMARY_H +#pragma once #include #include @@ -54,5 +53,3 @@ void meta_wayland_data_device_primary_init (MetaWaylandDataDevicePrimary *data_d MetaWaylandSeat *seat); void meta_wayland_data_device_primary_set_keyboard_focus (MetaWaylandDataDevicePrimary *data_device); - -#endif /* META_WAYLAND_DATA_DEVICE_PRIMARY_H */ diff --git a/src/wayland/meta-wayland-data-device.h b/src/wayland/meta-wayland-data-device.h index 0b53eccda..626b91948 100644 --- a/src/wayland/meta-wayland-data-device.h +++ b/src/wayland/meta-wayland-data-device.h @@ -20,8 +20,7 @@ * OF THIS SOFTWARE. */ -#ifndef META_WAYLAND_DATA_DEVICE_H -#define META_WAYLAND_DATA_DEVICE_H +#pragma once #include #include @@ -92,5 +91,3 @@ MetaWaylandSurface * meta_wayland_drag_grab_get_focus (MetaWaylandDragGrab *drag_grab); void meta_wayland_drag_grab_update_feedback_actor (MetaWaylandDragGrab *drag_grab, const ClutterEvent *event); - -#endif /* META_WAYLAND_DATA_DEVICE_H */ diff --git a/src/wayland/meta-wayland-data-offer-primary.h b/src/wayland/meta-wayland-data-offer-primary.h index 3922b7e92..8bbd7c709 100644 --- a/src/wayland/meta-wayland-data-offer-primary.h +++ b/src/wayland/meta-wayland-data-offer-primary.h @@ -21,12 +21,9 @@ * OF THIS SOFTWARE. */ -#ifndef META_WAYLAND_DATA_OFFER_PRIMARY_H -#define META_WAYLAND_DATA_OFFER_PRIMARY_H +#pragma once #include "meta-wayland-data-offer.h" MetaWaylandDataOffer * meta_wayland_data_offer_primary_new (MetaWaylandCompositor *compositor, struct wl_resource *target); - -#endif /* META_WAYLAND_DATA_OFFER_PRIMARY_H */ diff --git a/src/wayland/meta-wayland-data-offer.h b/src/wayland/meta-wayland-data-offer.h index 7fcd0248d..7b2fae661 100644 --- a/src/wayland/meta-wayland-data-offer.h +++ b/src/wayland/meta-wayland-data-offer.h @@ -21,8 +21,7 @@ * OF THIS SOFTWARE. */ -#ifndef META_WAYLAND_DATA_OFFER_H -#define META_WAYLAND_DATA_OFFER_H +#pragma once #include "meta/meta-selection.h" #include "wayland/meta-wayland-data-source.h" @@ -50,5 +49,3 @@ void meta_wayland_data_offer_update_action (MetaWaylandDataOffer *offer); struct wl_resource * meta_wayland_data_offer_get_resource (MetaWaylandDataOffer *offer); MetaWaylandDataSource * meta_wayland_data_offer_get_source (MetaWaylandDataOffer *offer); - -#endif /* META_WAYLAND_DATA_OFFER_H */ diff --git a/src/wayland/meta-wayland-data-source-primary.h b/src/wayland/meta-wayland-data-source-primary.h index 78ab55c19..249e70b2c 100644 --- a/src/wayland/meta-wayland-data-source-primary.h +++ b/src/wayland/meta-wayland-data-source-primary.h @@ -21,8 +21,7 @@ * OF THIS SOFTWARE. */ -#ifndef META_WAYLAND_DATA_SOURCE_PRIMARY_H -#define META_WAYLAND_DATA_SOURCE_PRIMARY_H +#pragma once #include "meta-wayland-data-source.h" @@ -33,5 +32,3 @@ G_DECLARE_FINAL_TYPE (MetaWaylandDataSourcePrimary, MetaWaylandDataSource); MetaWaylandDataSource * meta_wayland_data_source_primary_new (struct wl_resource *resource); - -#endif /* META_WAYLAND_DATA_SOURCE_PRIMARY_H */ diff --git a/src/wayland/meta-wayland-data-source.h b/src/wayland/meta-wayland-data-source.h index 5d0e6c3f1..256b13481 100644 --- a/src/wayland/meta-wayland-data-source.h +++ b/src/wayland/meta-wayland-data-source.h @@ -21,8 +21,7 @@ * OF THIS SOFTWARE. */ -#ifndef META_WAYLAND_DATA_SOURCE_H -#define META_WAYLAND_DATA_SOURCE_H +#pragma once #include #include @@ -111,5 +110,3 @@ gboolean meta_wayland_data_source_get_drop_performed (MetaWaylandDataSource *sou void meta_wayland_data_source_notify_drop_performed (MetaWaylandDataSource *source); void meta_wayland_data_source_notify_finish (MetaWaylandDataSource *source); - -#endif /* META_WAYLAND_DATA_SOURCE_H */ diff --git a/src/wayland/meta-wayland-dma-buf.h b/src/wayland/meta-wayland-dma-buf.h index 3fdaf0158..4aa67a07e 100644 --- a/src/wayland/meta-wayland-dma-buf.h +++ b/src/wayland/meta-wayland-dma-buf.h @@ -24,8 +24,7 @@ * Daniel Stone */ -#ifndef META_WAYLAND_DMA_BUF_H -#define META_WAYLAND_DMA_BUF_H +#pragma once #include #include @@ -69,5 +68,3 @@ meta_wayland_dma_buf_create_source (MetaWaylandBuffer *buffer, CoglScanout * meta_wayland_dma_buf_try_acquire_scanout (MetaWaylandDmaBufBuffer *dma_buf, CoglOnscreen *onscreen); - -#endif /* META_WAYLAND_DMA_BUF_H */ diff --git a/src/wayland/meta-wayland-dnd-surface.h b/src/wayland/meta-wayland-dnd-surface.h index 45cf689ee..74d6c5ddd 100644 --- a/src/wayland/meta-wayland-dnd-surface.h +++ b/src/wayland/meta-wayland-dnd-surface.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_DND_SURFACE_H -#define META_WAYLAND_DND_SURFACE_H +#pragma once #include "wayland/meta-wayland-actor-surface.h" @@ -27,5 +26,3 @@ G_DECLARE_FINAL_TYPE (MetaWaylandSurfaceRoleDND, meta_wayland_surface_role_dnd, META, WAYLAND_SURFACE_ROLE_DND, MetaWaylandActorSurface) - -#endif /* META_WAYLAND_DND_SURFACE_H */ diff --git a/src/wayland/meta-wayland-egl-stream.h b/src/wayland/meta-wayland-egl-stream.h index b8a6b1968..c0ebd4328 100644 --- a/src/wayland/meta-wayland-egl-stream.h +++ b/src/wayland/meta-wayland-egl-stream.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_WAYLAND_EGL_STREAM_H -#define META_WAYLAND_EGL_STREAM_H +#pragma once #include #include @@ -50,5 +49,3 @@ CoglTexture2D * meta_wayland_egl_stream_create_texture (MetaWaylandEglStream *st CoglSnippet * meta_wayland_egl_stream_create_snippet (MetaWaylandEglStream *stream); gboolean meta_wayland_egl_stream_is_y_inverted (MetaWaylandEglStream *stream); - -#endif /* META_WAYLAND_EGL_STREAM_H */ diff --git a/src/wayland/meta-wayland-filter-manager.h b/src/wayland/meta-wayland-filter-manager.h index 789dfc959..e2dfc8d20 100644 --- a/src/wayland/meta-wayland-filter-manager.h +++ b/src/wayland/meta-wayland-filter-manager.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_FILTER_MANAGER_H -#define META_WAYLAND_FILTER_MANAGER_H +#pragma once #include #include @@ -52,5 +51,3 @@ void meta_wayland_filter_manager_add_global (MetaWaylandFilterManager *filter_ma META_EXPORT_TEST void meta_wayland_filter_manager_remove_global (MetaWaylandFilterManager *filter_manager, struct wl_global *global); - -#endif /* META_WAYLAND_FILTER_MANAGER_H */ diff --git a/src/wayland/meta-wayland-fractional-scale.h b/src/wayland/meta-wayland-fractional-scale.h index 0c2105275..b80e5c8dc 100644 --- a/src/wayland/meta-wayland-fractional-scale.h +++ b/src/wayland/meta-wayland-fractional-scale.h @@ -20,8 +20,7 @@ * */ -#ifndef META_WAYLAND_FRACTIONAL_SCALE_H -#define META_WAYLAND_FRACTIONAL_SCALE_H +#pragma once #include "wayland/meta-wayland-types.h" @@ -29,5 +28,3 @@ void meta_wayland_init_fractional_scale (MetaWaylandCompositor *compositor); void meta_wayland_fractional_scale_maybe_send_preferred_scale (MetaWaylandSurface *surface, double scale); - -#endif /* META_WAYLAND_FRACTIONAL_SCALE_H */ diff --git a/src/wayland/meta-wayland-gtk-shell.h b/src/wayland/meta-wayland-gtk-shell.h index 347c1f398..e78114169 100644 --- a/src/wayland/meta-wayland-gtk-shell.h +++ b/src/wayland/meta-wayland-gtk-shell.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_GTK_SHELL_H -#define META_WAYLAND_GTK_SHELL_H +#pragma once #include "wayland/meta-wayland.h" @@ -27,5 +26,3 @@ G_DECLARE_FINAL_TYPE (MetaWaylandGtkShell, meta_wayland_gtk_shell, META, WAYLAND_GTK_SHELL, GObject) void meta_wayland_init_gtk_shell (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_GTK_SHELL_H */ diff --git a/src/wayland/meta-wayland-inhibit-shortcuts-dialog.h b/src/wayland/meta-wayland-inhibit-shortcuts-dialog.h index 7f3501565..87c47537e 100644 --- a/src/wayland/meta-wayland-inhibit-shortcuts-dialog.h +++ b/src/wayland/meta-wayland-inhibit-shortcuts-dialog.h @@ -16,8 +16,7 @@ * */ -#ifndef META_WAYLAND_INHIBIT_SHORTCUTS_DIALOG_H -#define META_WAYLAND_INHIBIT_SHORTCUTS_DIALOG_H +#pragma once #include "wayland/meta-wayland-private.h" @@ -27,5 +26,3 @@ void meta_wayland_surface_show_inhibit_shortcuts_dialog (MetaWaylandSurface void meta_wayland_surface_cancel_inhibit_shortcuts_dialog (MetaWaylandSurface *surface); void meta_wayland_surface_inhibit_shortcuts_dialog_init (void); - -#endif /* META_WAYLAND_INHIBIT_SHORTCUTS_DIALOG_H */ diff --git a/src/wayland/meta-wayland-inhibit-shortcuts.h b/src/wayland/meta-wayland-inhibit-shortcuts.h index 52b2240c4..510be788f 100644 --- a/src/wayland/meta-wayland-inhibit-shortcuts.h +++ b/src/wayland/meta-wayland-inhibit-shortcuts.h @@ -20,8 +20,7 @@ * Olivier Fourdan */ -#ifndef META_WAYLAND_INHIBIT_SHORTCUTS_H -#define META_WAYLAND_INHIBIT_SHORTCUTS_H +#pragma once #include @@ -35,5 +34,3 @@ G_DECLARE_FINAL_TYPE (MetaWaylandKeyboardShotscutsInhibit, GObject); gboolean meta_wayland_keyboard_shortcuts_inhibit_init (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_INHIBIT_SHORTCUTS_H */ diff --git a/src/wayland/meta-wayland-input-device.h b/src/wayland/meta-wayland-input-device.h index c6a6c3d38..004590760 100644 --- a/src/wayland/meta-wayland-input-device.h +++ b/src/wayland/meta-wayland-input-device.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_WAYLAND_INPUT_DEVICE_H -#define META_WAYLAND_INPUT_DEVICE_H +#pragma once #include #include @@ -44,5 +43,3 @@ struct _MetaWaylandInputDeviceClass MetaWaylandSeat * meta_wayland_input_device_get_seat (MetaWaylandInputDevice *input_device); uint32_t meta_wayland_input_device_next_serial (MetaWaylandInputDevice *input_device); - -#endif /* META_WAYLAND_INPUT_DEVICE_H */ diff --git a/src/wayland/meta-wayland-keyboard.h b/src/wayland/meta-wayland-keyboard.h index 0600f5ae0..4058bd5da 100644 --- a/src/wayland/meta-wayland-keyboard.h +++ b/src/wayland/meta-wayland-keyboard.h @@ -42,8 +42,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef META_WAYLAND_KEYBOARD_H -#define META_WAYLAND_KEYBOARD_H +#pragma once #include #include @@ -143,5 +142,3 @@ void meta_wayland_keyboard_start_grab (MetaWaylandKeyboard *keyboard, void meta_wayland_keyboard_end_grab (MetaWaylandKeyboard *keyboard); gboolean meta_wayland_keyboard_is_grabbed (MetaWaylandKeyboard *keyboard); - -#endif /* META_WAYLAND_KEYBOARD_H */ diff --git a/src/wayland/meta-wayland-legacy-xdg-foreign.h b/src/wayland/meta-wayland-legacy-xdg-foreign.h index a8ad24af7..192996552 100644 --- a/src/wayland/meta-wayland-legacy-xdg-foreign.h +++ b/src/wayland/meta-wayland-legacy-xdg-foreign.h @@ -22,13 +22,10 @@ * Jonas Ådahl */ -#ifndef META_WAYLAND_LEGACY_FOREIGN_H -#define META_WAYLAND_LEGACY_FOREIGN_H +#pragma once #include #include "wayland/meta-wayland-types.h" gboolean meta_wayland_legacy_xdg_foreign_init (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_LEGACY_FOREIGN_H */ diff --git a/src/wayland/meta-wayland-outputs.h b/src/wayland/meta-wayland-outputs.h index af3a509ce..ec58f0f5b 100644 --- a/src/wayland/meta-wayland-outputs.h +++ b/src/wayland/meta-wayland-outputs.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef META_WAYLAND_OUTPUTS_H -#define META_WAYLAND_OUTPUTS_H +#pragma once #include "backends/meta-monitor-manager-private.h" #include "wayland/meta-wayland-private.h" @@ -39,5 +38,3 @@ MetaLogicalMonitor * meta_wayland_output_get_logical_monitor (MetaWaylandOutput void meta_wayland_outputs_finalize (MetaWaylandCompositor *compositor); void meta_wayland_outputs_init (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_OUTPUTS_H */ diff --git a/src/wayland/meta-wayland-pointer-constraints.h b/src/wayland/meta-wayland-pointer-constraints.h index 2113d9a9a..00b577aa1 100644 --- a/src/wayland/meta-wayland-pointer-constraints.h +++ b/src/wayland/meta-wayland-pointer-constraints.h @@ -22,8 +22,7 @@ * Jonas Ådahl */ -#ifndef META_WAYLAND_POINTER_CONSTRAINTS_H -#define META_WAYLAND_POINTER_CONSTRAINTS_H +#pragma once #include @@ -45,5 +44,3 @@ cairo_region_t * meta_wayland_pointer_constraint_calculate_effective_region (Met MetaWaylandSurface * meta_wayland_pointer_constraint_get_surface (MetaWaylandPointerConstraint *constraint); MetaWaylandCompositor * meta_wayland_pointer_constraint_get_compositor (MetaWaylandPointerConstraint *constraint); - -#endif /* META_WAYLAND_POINTER_CONSTRAINTS_H */ diff --git a/src/wayland/meta-wayland-pointer-gesture-hold.h b/src/wayland/meta-wayland-pointer-gesture-hold.h index f79c0b109..dbd373561 100644 --- a/src/wayland/meta-wayland-pointer-gesture-hold.h +++ b/src/wayland/meta-wayland-pointer-gesture-hold.h @@ -17,8 +17,7 @@ * Author: José Expósito */ -#ifndef META_WAYLAND_POINTER_GESTURE_HOLD_H -#define META_WAYLAND_POINTER_GESTURE_HOLD_H +#pragma once #include #include @@ -36,5 +35,3 @@ void meta_wayland_pointer_gesture_hold_create_new_resource (MetaWaylandPointer * void meta_wayland_pointer_gesture_hold_cancel (MetaWaylandPointer *pointer, uint32_t serial); - -#endif /* META_WAYLAND_POINTER_GESTURE_HOLD_H */ diff --git a/src/wayland/meta-wayland-pointer-gesture-pinch.h b/src/wayland/meta-wayland-pointer-gesture-pinch.h index f5f1461ab..65c2c3f02 100644 --- a/src/wayland/meta-wayland-pointer-gesture-pinch.h +++ b/src/wayland/meta-wayland-pointer-gesture-pinch.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_POINTER_GESTURE_PINCH_H -#define META_WAYLAND_POINTER_GESTURE_PINCH_H +#pragma once #include #include @@ -38,5 +37,3 @@ void meta_wayland_pointer_gesture_pinch_create_new_resource (MetaWaylandPointer void meta_wayland_pointer_gesture_pinch_cancel (MetaWaylandPointer *pointer, uint32_t serial); - -#endif /* META_WAYLAND_POINTER_GESTURE_PINCH_H */ diff --git a/src/wayland/meta-wayland-pointer-gesture-swipe.h b/src/wayland/meta-wayland-pointer-gesture-swipe.h index 7d7c679d6..4aea9974a 100644 --- a/src/wayland/meta-wayland-pointer-gesture-swipe.h +++ b/src/wayland/meta-wayland-pointer-gesture-swipe.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_POINTER_GESTURE_SWIPE_H -#define META_WAYLAND_POINTER_GESTURE_SWIPE_H +#pragma once #include #include @@ -38,5 +37,3 @@ void meta_wayland_pointer_gesture_swipe_create_new_resource (MetaWaylandPointer void meta_wayland_pointer_gesture_swipe_cancel (MetaWaylandPointer *pointer, uint32_t serial); - -#endif /* META_WAYLAND_POINTER_GESTURE_SWIPE_H */ diff --git a/src/wayland/meta-wayland-pointer-gestures.h b/src/wayland/meta-wayland-pointer-gestures.h index 48792da12..ccdde8a11 100644 --- a/src/wayland/meta-wayland-pointer-gestures.h +++ b/src/wayland/meta-wayland-pointer-gestures.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_POINTER_GESTURES_H -#define META_WAYLAND_POINTER_GESTURES_H +#pragma once #include #include @@ -28,5 +27,3 @@ #include "wayland/meta-wayland-types.h" void meta_wayland_pointer_gestures_init (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_POINTER_GESTURES_H */ diff --git a/src/wayland/meta-wayland-pointer.h b/src/wayland/meta-wayland-pointer.h index f7b91a5c2..479d8141b 100644 --- a/src/wayland/meta-wayland-pointer.h +++ b/src/wayland/meta-wayland-pointer.h @@ -17,8 +17,7 @@ * License along with this library. If not, see . */ -#ifndef META_WAYLAND_POINTER_H -#define META_WAYLAND_POINTER_H +#pragma once #include #include @@ -160,5 +159,3 @@ void meta_wayland_surface_cursor_update (MetaWaylandSurface *cursor_surface); void meta_wayland_pointer_update_cursor_surface (MetaWaylandPointer *pointer); gboolean meta_wayland_pointer_is_grabbed (MetaWaylandPointer *pointer); - -#endif /* META_WAYLAND_POINTER_H */ diff --git a/src/wayland/meta-wayland-popup.h b/src/wayland/meta-wayland-popup.h index 3cc90e22a..19a3c0094 100644 --- a/src/wayland/meta-wayland-popup.h +++ b/src/wayland/meta-wayland-popup.h @@ -18,8 +18,7 @@ * License along with this library. If not, see . */ -#ifndef META_WAYLAND_POPUP_H -#define META_WAYLAND_POPUP_H +#pragma once #include #include @@ -58,5 +57,3 @@ void meta_wayland_popup_destroy (MetaWaylandPopup *popup); void meta_wayland_popup_dismiss (MetaWaylandPopup *popup); MetaWaylandSurface *meta_wayland_popup_get_top_popup (MetaWaylandPopup *popup); - -#endif /* META_WAYLAND_POPUP_H */ diff --git a/src/wayland/meta-wayland-presentation-time-private.h b/src/wayland/meta-wayland-presentation-time-private.h index a4d8bfa60..2eea62121 100644 --- a/src/wayland/meta-wayland-presentation-time-private.h +++ b/src/wayland/meta-wayland-presentation-time-private.h @@ -20,8 +20,7 @@ * */ -#ifndef META_WAYLAND_PRESENTATION_TIME_PRIVATE_H -#define META_WAYLAND_PRESENTATION_TIME_PRIVATE_H +#pragma once #include @@ -65,5 +64,3 @@ struct wl_list * meta_wayland_presentation_time_ensure_feedbacks (MetaWaylandPre void meta_wayland_presentation_time_cursor_painted (MetaWaylandPresentationTime *presentation_time, ClutterStageView *stage_view, MetaWaylandCursorSurface *cursor_surface); - -#endif /* META_WAYLAND_PRESENTATION_TIME_PRIVATE_H */ diff --git a/src/wayland/meta-wayland-private.h b/src/wayland/meta-wayland-private.h index 7530a9d81..280ceb3cc 100644 --- a/src/wayland/meta-wayland-private.h +++ b/src/wayland/meta-wayland-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_PRIVATE_H -#define META_WAYLAND_PRIVATE_H +#pragma once #include #include @@ -115,5 +114,3 @@ struct _MetaWaylandCompositor }; gboolean meta_wayland_compositor_is_egl_display_bound (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_PRIVATE_H */ diff --git a/src/wayland/meta-wayland-region.h b/src/wayland/meta-wayland-region.h index 201580a67..f1eae9fcf 100644 --- a/src/wayland/meta-wayland-region.h +++ b/src/wayland/meta-wayland-region.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef META_WAYLAND_REGION_H -#define META_WAYLAND_REGION_H +#pragma once #include #include @@ -37,5 +36,3 @@ MetaWaylandRegion * meta_wayland_region_create (MetaWaylandCompositor *composito guint32 id); cairo_region_t * meta_wayland_region_peek_cairo_region (MetaWaylandRegion *region); - -#endif /* META_WAYLAND_REGION_H */ diff --git a/src/wayland/meta-wayland-seat.h b/src/wayland/meta-wayland-seat.h index 852d601b8..a403489dc 100644 --- a/src/wayland/meta-wayland-seat.h +++ b/src/wayland/meta-wayland-seat.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_SEAT_H -#define META_WAYLAND_SEAT_H +#pragma once #include @@ -87,5 +86,3 @@ gboolean meta_wayland_seat_has_touch (MetaWaylandSeat *seat); MetaWaylandCompositor * meta_wayland_seat_get_compositor (MetaWaylandSeat *seat); gboolean meta_wayland_seat_is_grabbed (MetaWaylandSeat *seat); - -#endif /* META_WAYLAND_SEAT_H */ diff --git a/src/wayland/meta-wayland-shell-surface.h b/src/wayland/meta-wayland-shell-surface.h index d1bbeef65..f95433ccb 100644 --- a/src/wayland/meta-wayland-shell-surface.h +++ b/src/wayland/meta-wayland-shell-surface.h @@ -18,8 +18,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_SHELL_SURFACE_H -#define META_WAYLAND_SHELL_SURFACE_H +#pragma once #include "wayland/meta-wayland-actor-surface.h" @@ -64,5 +63,3 @@ void meta_wayland_shell_surface_set_window (MetaWaylandShellSurface *shell_surfa MetaWindow *window); void meta_wayland_shell_surface_destroy_window (MetaWaylandShellSurface *shell_surface); - -#endif /* META_WAYLAND_SHELL_SURFACE_H */ diff --git a/src/wayland/meta-wayland-single-pixel-buffer.h b/src/wayland/meta-wayland-single-pixel-buffer.h index 28889809b..f63465ea6 100644 --- a/src/wayland/meta-wayland-single-pixel-buffer.h +++ b/src/wayland/meta-wayland-single-pixel-buffer.h @@ -18,8 +18,7 @@ * */ -#ifndef META_WAYLAND_SINGLE_PIXEL_BUFFER_H -#define META_WAYLAND_SINGLE_PIXEL_BUFFER_H +#pragma once #include @@ -38,5 +37,3 @@ MetaWaylandSinglePixelBuffer * meta_wayland_single_pixel_buffer_from_buffer (Met void meta_wayland_init_single_pixel_buffer_manager (MetaWaylandCompositor *compositor); void meta_wayland_single_pixel_buffer_free (MetaWaylandSinglePixelBuffer *single_pixel_buffer); - -#endif /* META_WAYLAND_SINGLE_PIXEL_BUFFER_H */ diff --git a/src/wayland/meta-wayland-subsurface.h b/src/wayland/meta-wayland-subsurface.h index 61338e921..1f0a499f1 100644 --- a/src/wayland/meta-wayland-subsurface.h +++ b/src/wayland/meta-wayland-subsurface.h @@ -18,8 +18,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_SUBSURFACE_H -#define META_WAYLAND_SUBSURFACE_H +#pragma once #include "wayland/meta-wayland-actor-surface.h" @@ -50,5 +49,3 @@ void meta_wayland_subsurface_union_geometry (MetaWaylandSubsurface *subsurface, void meta_wayland_subsurface_parent_destroyed (MetaWaylandSurface *surface); void meta_wayland_subsurfaces_init (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_SUBSURFACE_H */ diff --git a/src/wayland/meta-wayland-surface.h b/src/wayland/meta-wayland-surface.h index c00eaee27..9a3656c56 100644 --- a/src/wayland/meta-wayland-surface.h +++ b/src/wayland/meta-wayland-surface.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_SURFACE_H -#define META_WAYLAND_SURFACE_H +#pragma once #include #include @@ -460,5 +459,3 @@ meta_get_first_subsurface_node (struct MetaWaylandSurfaceSubState *sub) (subsurface = (G_PASTE (__n, __LINE__) ? G_PASTE (__n, __LINE__)->data : NULL)); \ G_PASTE (__n, __LINE__) = G_PASTE (__next, __LINE__), \ G_PASTE (__next, __LINE__) = meta_get_next_subsurface_sibling (G_PASTE (__n, __LINE__))) - -#endif diff --git a/src/wayland/meta-wayland-tablet-cursor-surface.h b/src/wayland/meta-wayland-tablet-cursor-surface.h index df41e832e..03935a7bf 100644 --- a/src/wayland/meta-wayland-tablet-cursor-surface.h +++ b/src/wayland/meta-wayland-tablet-cursor-surface.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_TABLET_CURSOR_SURFACE_H -#define META_WAYLAND_TABLET_CURSOR_SURFACE_H +#pragma once #include "wayland/meta-wayland-cursor-surface.h" @@ -29,5 +28,3 @@ G_DECLARE_FINAL_TYPE (MetaWaylandTabletCursorSurface, meta_wayland_tablet_cursor_surface, META, WAYLAND_TABLET_CURSOR_SURFACE, MetaWaylandCursorSurface) - -#endif /* META_WAYLAND_TABLET_CURSOR_SURFACE_H */ diff --git a/src/wayland/meta-wayland-tablet-manager.h b/src/wayland/meta-wayland-tablet-manager.h index 6491fbcbc..68f5e6938 100644 --- a/src/wayland/meta-wayland-tablet-manager.h +++ b/src/wayland/meta-wayland-tablet-manager.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_TABLET_MANAGER_H -#define META_WAYLAND_TABLET_MANAGER_H +#pragma once #include #include @@ -49,5 +48,3 @@ gboolean meta_wayland_tablet_manager_handle_event (MetaWaylandTabletManager *m MetaWaylandTabletSeat * meta_wayland_tablet_manager_ensure_seat (MetaWaylandTabletManager *manager, MetaWaylandSeat *seat); - -#endif /* META_WAYLAND_TABLET_MANAGER_H */ diff --git a/src/wayland/meta-wayland-tablet-pad-group.h b/src/wayland/meta-wayland-tablet-pad-group.h index 0df3cc1f8..073f9abdb 100644 --- a/src/wayland/meta-wayland-tablet-pad-group.h +++ b/src/wayland/meta-wayland-tablet-pad-group.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_TABLET_PAD_GROUP_H -#define META_WAYLAND_TABLET_PAD_GROUP_H +#pragma once #include #include @@ -69,5 +68,3 @@ gboolean meta_wayland_tablet_pad_group_has_button (MetaWaylandTab guint button); gboolean meta_wayland_tablet_pad_group_is_mode_switch_button (MetaWaylandTabletPadGroup *group, guint button); - -#endif /* META_WAYLAND_TABLET_PAD_GROUP_H */ diff --git a/src/wayland/meta-wayland-tablet-pad-ring.h b/src/wayland/meta-wayland-tablet-pad-ring.h index 744ba2e84..84cc2927f 100644 --- a/src/wayland/meta-wayland-tablet-pad-ring.h +++ b/src/wayland/meta-wayland-tablet-pad-ring.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_TABLET_PAD_RING_H -#define META_WAYLAND_TABLET_PAD_RING_H +#pragma once #include #include @@ -54,6 +53,3 @@ gboolean meta_wayland_tablet_pad_ring_handle_event (MetaWaylandTablet const ClutterEvent *event); void meta_wayland_tablet_pad_ring_sync_focus (MetaWaylandTabletPadRing *ring); - -#endif /* META_WAYLAND_TABLET_PAD_RING_H */ - diff --git a/src/wayland/meta-wayland-tablet-pad-strip.h b/src/wayland/meta-wayland-tablet-pad-strip.h index 9d69de4eb..19094b5a0 100644 --- a/src/wayland/meta-wayland-tablet-pad-strip.h +++ b/src/wayland/meta-wayland-tablet-pad-strip.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_TABLET_PAD_STRIP_H -#define META_WAYLAND_TABLET_PAD_STRIP_H +#pragma once #include #include @@ -55,5 +54,3 @@ gboolean meta_wayland_tablet_pad_strip_handle_event (MetaWaylandTable const ClutterEvent *event); void meta_wayland_tablet_pad_strip_sync_focus (MetaWaylandTabletPadStrip *strip); - -#endif /* META_WAYLAND_TABLET_PAD_STRIP_H */ diff --git a/src/wayland/meta-wayland-tablet-pad.h b/src/wayland/meta-wayland-tablet-pad.h index 4b1f9e261..bab5eea5c 100644 --- a/src/wayland/meta-wayland-tablet-pad.h +++ b/src/wayland/meta-wayland-tablet-pad.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_TABLET_PAD_H -#define META_WAYLAND_TABLET_PAD_H +#pragma once #include #include @@ -80,5 +79,3 @@ char * meta_wayland_tablet_pad_get_button_label (MetaWaylandTabletPad *pad, char * meta_wayland_tablet_pad_get_feature_label (MetaWaylandTabletPad *pad, MetaPadFeatureType feature, int action); - -#endif /* META_WAYLAND_TABLET_PAD_H */ diff --git a/src/wayland/meta-wayland-tablet-seat.h b/src/wayland/meta-wayland-tablet-seat.h index e8b5a2439..b0028190b 100644 --- a/src/wayland/meta-wayland-tablet-seat.h +++ b/src/wayland/meta-wayland-tablet-seat.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_TABLET_SEAT_H -#define META_WAYLAND_TABLET_SEAT_H +#pragma once #include #include @@ -77,5 +76,3 @@ GList *meta_wayland_tablet_seat_lookup_paired_pads (MetaWaylan MetaWaylandTablet *tablet); gboolean meta_wayland_tablet_seat_can_popup (MetaWaylandTabletSeat *tablet_seat, uint32_t serial); - -#endif /* META_WAYLAND_TABLET_SEAT_H */ diff --git a/src/wayland/meta-wayland-tablet-tool.h b/src/wayland/meta-wayland-tablet-tool.h index 9fc704851..a86ac0470 100644 --- a/src/wayland/meta-wayland-tablet-tool.h +++ b/src/wayland/meta-wayland-tablet-tool.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_TABLET_TOOL_H -#define META_WAYLAND_TABLET_TOOL_H +#pragma once #include #include @@ -82,5 +81,3 @@ gboolean meta_wayland_tablet_tool_can_grab_surface (MetaWaylandTabletTool *tool, uint32_t serial); gboolean meta_wayland_tablet_tool_can_popup (MetaWaylandTabletTool *tool, uint32_t serial); - -#endif /* META_WAYLAND_TABLET_TOOL_H */ diff --git a/src/wayland/meta-wayland-tablet.h b/src/wayland/meta-wayland-tablet.h index 0bc3b87b9..d98299b69 100644 --- a/src/wayland/meta-wayland-tablet.h +++ b/src/wayland/meta-wayland-tablet.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_TABLET_H -#define META_WAYLAND_TABLET_H +#pragma once #include @@ -54,5 +53,3 @@ struct wl_resource * void meta_wayland_tablet_notify (MetaWaylandTablet *tablet, struct wl_resource *resource); - -#endif /* META_WAYLAND_TABLET_H */ diff --git a/src/wayland/meta-wayland-text-input.h b/src/wayland/meta-wayland-text-input.h index 49555732a..40c2ab731 100644 --- a/src/wayland/meta-wayland-text-input.h +++ b/src/wayland/meta-wayland-text-input.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_TEXT_INPUT_H -#define META_WAYLAND_TEXT_INPUT_H +#pragma once #include @@ -46,5 +45,3 @@ gboolean meta_wayland_text_input_update (MetaWaylandTextInput *text_input, gboolean meta_wayland_text_input_handle_event (MetaWaylandTextInput *text_input, const ClutterEvent *event); - -#endif /* META_WAYLAND_TEXT_INPUT_H */ diff --git a/src/wayland/meta-wayland-touch.h b/src/wayland/meta-wayland-touch.h index 304d8227e..ab2138adb 100644 --- a/src/wayland/meta-wayland-touch.h +++ b/src/wayland/meta-wayland-touch.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_WAYLAND_TOUCH_H -#define META_WAYLAND_TOUCH_H +#pragma once #include #include @@ -74,5 +73,3 @@ gboolean meta_wayland_touch_get_press_coords (MetaWaylandTouch *touch, gboolean meta_wayland_touch_can_popup (MetaWaylandTouch *touch, uint32_t serial); - -#endif /* META_WAYLAND_TOUCH_H */ diff --git a/src/wayland/meta-wayland-transaction.h b/src/wayland/meta-wayland-transaction.h index 98c662001..46915597c 100644 --- a/src/wayland/meta-wayland-transaction.h +++ b/src/wayland/meta-wayland-transaction.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_TRANSACTION_H -#define META_WAYLAND_TRANSACTION_H +#pragma once #include "wayland/meta-wayland-types.h" #include "wayland/meta-wayland-subsurface.h" @@ -55,5 +54,3 @@ void meta_wayland_transaction_free (MetaWaylandTransaction *transaction); void meta_wayland_transaction_finalize (MetaWaylandCompositor *compositor); void meta_wayland_transaction_init (MetaWaylandCompositor *compositor); - -#endif diff --git a/src/wayland/meta-wayland-types.h b/src/wayland/meta-wayland-types.h index 0b96abd90..b15e62325 100644 --- a/src/wayland/meta-wayland-types.h +++ b/src/wayland/meta-wayland-types.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_TYPES_H -#define META_WAYLAND_TYPES_H +#pragma once typedef struct _MetaWaylandCompositor MetaWaylandCompositor; @@ -76,5 +75,3 @@ typedef struct _MetaWaylandXdgForeign MetaWaylandXdgForeign; typedef struct _MetaWaylandFilterManager MetaWaylandFilterManager; typedef struct _MetaWaylandClient MetaWaylandClient; - -#endif diff --git a/src/wayland/meta-wayland-versions.h b/src/wayland/meta-wayland-versions.h index 2323d3407..061163c92 100644 --- a/src/wayland/meta-wayland-versions.h +++ b/src/wayland/meta-wayland-versions.h @@ -20,8 +20,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_VERSIONS_H -#define META_WAYLAND_VERSIONS_H +#pragma once /* Protocol objects, will never change version */ /* #define META_WL_DISPLAY_VERSION 1 */ @@ -59,5 +58,3 @@ #define META_WP_SINGLE_PIXEL_BUFFER_V1_VERSION 1 #define META_MUTTER_X11_INTEROP_VERSION 1 #define META_WP_FRACTIONAL_SCALE_VERSION 1 - -#endif diff --git a/src/wayland/meta-wayland-viewporter.h b/src/wayland/meta-wayland-viewporter.h index 8cc099b11..1e7f4316e 100644 --- a/src/wayland/meta-wayland-viewporter.h +++ b/src/wayland/meta-wayland-viewporter.h @@ -20,11 +20,8 @@ * */ -#ifndef META_WAYLAND_VIEWPORTER_H -#define META_WAYLAND_VIEWPORTER_H +#pragma once #include "wayland/meta-wayland-types.h" void meta_wayland_init_viewporter (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_VIEWPORTER_H */ diff --git a/src/wayland/meta-wayland-window-configuration.h b/src/wayland/meta-wayland-window-configuration.h index 3e5aaffca..a79681eb8 100644 --- a/src/wayland/meta-wayland-window-configuration.h +++ b/src/wayland/meta-wayland-window-configuration.h @@ -18,8 +18,7 @@ * */ -#ifndef META_WAYLAND_WINDOW_CONFIGURATION_H -#define META_WAYLAND_WINDOW_CONFIGURATION_H +#pragma once #include #include @@ -73,5 +72,3 @@ MetaWaylandWindowConfiguration * meta_wayland_window_configuration_new_empty (in int bounds_height); void meta_wayland_window_configuration_free (MetaWaylandWindowConfiguration *configuration); - -#endif /* META_WAYLAND_WINDOW_CONFIGURATION_H */ diff --git a/src/wayland/meta-wayland-x11-interop.h b/src/wayland/meta-wayland-x11-interop.h index cd252987c..30bb59306 100644 --- a/src/wayland/meta-wayland-x11-interop.h +++ b/src/wayland/meta-wayland-x11-interop.h @@ -17,11 +17,8 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_X11_INTEROP_H -#define META_WAYLAND_X11_INTEROP_H +#pragma once #include "wayland/meta-wayland-types.h" void meta_wayland_x11_interop_init (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_X11_INTEROP_H */ diff --git a/src/wayland/meta-wayland-xdg-foreign-private.h b/src/wayland/meta-wayland-xdg-foreign-private.h index 8ce0ce92b..b9b40645f 100644 --- a/src/wayland/meta-wayland-xdg-foreign-private.h +++ b/src/wayland/meta-wayland-xdg-foreign-private.h @@ -22,8 +22,7 @@ * Jason Francis */ -#ifndef META_WAYLAND_FOREIGN_PRIVATE_H -#define META_WAYLAND_FOREIGN_PRIVATE_H +#pragma once #include @@ -57,5 +56,3 @@ void meta_wayland_xdg_imported_set_parent_of (MetaWaylandXdgImported *imported, struct wl_resource *surface_resource); void meta_wayland_xdg_imported_destroy (MetaWaylandXdgImported *imported); - -#endif /* META_WAYLAND_FOREIGN_PRIVATE_H */ diff --git a/src/wayland/meta-wayland-xdg-foreign.h b/src/wayland/meta-wayland-xdg-foreign.h index 5542a301e..365e4a264 100644 --- a/src/wayland/meta-wayland-xdg-foreign.h +++ b/src/wayland/meta-wayland-xdg-foreign.h @@ -22,13 +22,10 @@ * Jonas Ådahl */ -#ifndef META_WAYLAND_FOREIGN_H -#define META_WAYLAND_FOREIGN_H +#pragma once #include #include "wayland/meta-wayland-types.h" gboolean meta_wayland_xdg_foreign_init (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_FOREIGN_H */ diff --git a/src/wayland/meta-wayland-xdg-shell.h b/src/wayland/meta-wayland-xdg-shell.h index f90e29bea..558fa8472 100644 --- a/src/wayland/meta-wayland-xdg-shell.h +++ b/src/wayland/meta-wayland-xdg-shell.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_WAYLAND_XDG_SHELL_H -#define META_WAYLAND_XDG_SHELL_H +#pragma once #include "wayland/meta-wayland-shell-surface.h" @@ -49,5 +48,3 @@ G_DECLARE_FINAL_TYPE (MetaWaylandXdgPopup, MetaWaylandXdgSurface); void meta_wayland_xdg_shell_init (MetaWaylandCompositor *compositor); - -#endif /* META_WAYLAND_XDG_SHELL_H */ diff --git a/src/wayland/meta-wayland.h b/src/wayland/meta-wayland.h index 2a121e555..a3e13a80b 100644 --- a/src/wayland/meta-wayland.h +++ b/src/wayland/meta-wayland.h @@ -20,8 +20,7 @@ * Jasper St. Pierre */ -#ifndef META_WAYLAND_H -#define META_WAYLAND_H +#pragma once #include "clutter/clutter.h" #include "core/meta-context-private.h" @@ -108,5 +107,3 @@ gboolean meta_wayland_compositor_is_grabbed (MetaWaylandCompositor *compositor); META_EXPORT_TEST MetaWaylandFilterManager * meta_wayland_compositor_get_filter_manager (MetaWaylandCompositor *compositor); - -#endif diff --git a/src/wayland/meta-window-wayland.h b/src/wayland/meta-window-wayland.h index 5fd841d39..d5369f0d8 100644 --- a/src/wayland/meta-window-wayland.h +++ b/src/wayland/meta-window-wayland.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef META_WINDOW_WAYLAND_H -#define META_WINDOW_WAYLAND_H +#pragma once #include "core/window-private.h" #include "meta/window.h" @@ -79,5 +78,3 @@ gboolean meta_window_wayland_is_resize (MetaWindowWayland *wl_window, META_EXPORT_TEST gboolean meta_window_wayland_is_acked_fullscreen (MetaWindowWayland *wl_window); - -#endif diff --git a/src/wayland/meta-window-xwayland.h b/src/wayland/meta-window-xwayland.h index 5bec0cea8..7c02d6888 100644 --- a/src/wayland/meta-window-xwayland.h +++ b/src/wayland/meta-window-xwayland.h @@ -16,8 +16,7 @@ * */ -#ifndef META_WINDOW_XWAYLAND_H -#define META_WINDOW_XWAYLAND_H +#pragma once #include "meta/window.h" #include "x11/window-x11.h" @@ -34,5 +33,3 @@ void meta_window_xwayland_set_surface (MetaWindowXwayland *window, MetaWaylandSurface *surface); G_END_DECLS - -#endif diff --git a/src/wayland/meta-xwayland-dnd-private.h b/src/wayland/meta-xwayland-dnd-private.h index b55b4f8d3..cfd88908b 100644 --- a/src/wayland/meta-xwayland-dnd-private.h +++ b/src/wayland/meta-xwayland-dnd-private.h @@ -22,13 +22,10 @@ * Jonas Ådahl */ -#ifndef META_XWAYLAND_SELECTION_PRIVATE_H -#define META_XWAYLAND_SELECTION_PRIVATE_H +#pragma once #define META_TYPE_WAYLAND_DATA_SOURCE_XWAYLAND (meta_wayland_data_source_xwayland_get_type ()) G_DECLARE_FINAL_TYPE (MetaWaylandDataSourceXWayland, meta_wayland_data_source_xwayland, META, WAYLAND_DATA_SOURCE_XWAYLAND, MetaWaylandDataSource); - -#endif /* META_XWAYLAND_SELECTION_PRIVATE_H */ diff --git a/src/wayland/meta-xwayland-grab-keyboard.h b/src/wayland/meta-xwayland-grab-keyboard.h index 597854af5..211276ca0 100644 --- a/src/wayland/meta-xwayland-grab-keyboard.h +++ b/src/wayland/meta-xwayland-grab-keyboard.h @@ -20,8 +20,7 @@ * Olivier Fourdan */ -#ifndef META_XWAYLAND_GRAB_KEYBOARD_H -#define META_XWAYLAND_GRAB_KEYBOARD_H +#pragma once #include @@ -37,5 +36,3 @@ G_DECLARE_FINAL_TYPE (MetaXwaylandKeyboardActiveGrab, GObject); gboolean meta_xwayland_grab_keyboard_init (MetaWaylandCompositor *compositor); - -#endif /* META_XWAYLAND_GRAB_KEYBOARD_H */ diff --git a/src/wayland/meta-xwayland-private.h b/src/wayland/meta-xwayland-private.h index b9ef1af89..98983b6f8 100644 --- a/src/wayland/meta-xwayland-private.h +++ b/src/wayland/meta-xwayland-private.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_XWAYLAND_PRIVATE_H -#define META_XWAYLAND_PRIVATE_H +#pragma once #include @@ -60,5 +59,3 @@ gboolean meta_xwayland_start_xserver_finish (MetaXWaylandManager *manager, gboolean meta_xwayland_manager_handle_xevent (MetaXWaylandManager *manager, XEvent *xevent); - -#endif /* META_XWAYLAND_PRIVATE_H */ diff --git a/src/wayland/meta-xwayland-surface.h b/src/wayland/meta-xwayland-surface.h index 4bf305039..eb77d1eed 100644 --- a/src/wayland/meta-xwayland-surface.h +++ b/src/wayland/meta-xwayland-surface.h @@ -19,8 +19,7 @@ * */ -#ifndef META_XWAYLAND_SURFACE_H -#define META_XWAYLAND_SURFACE_H +#pragma once #include "meta/types.h" #include "wayland/meta-wayland-actor-surface.h" @@ -34,5 +33,3 @@ G_DECLARE_FINAL_TYPE (MetaXwaylandSurface, void meta_xwayland_surface_associate_with_window (MetaXwaylandSurface *xwayland_surface, MetaWindow *window); - -#endif /* META_XWAYLAND_SURFACE_H */ diff --git a/src/wayland/meta-xwayland.h b/src/wayland/meta-xwayland.h index 06f68ea2d..8a55f84ee 100644 --- a/src/wayland/meta-xwayland.h +++ b/src/wayland/meta-xwayland.h @@ -22,8 +22,7 @@ * Jasper St. Pierre */ -#ifndef META_XWAYLAND_H -#define META_XWAYLAND_H +#pragma once #include @@ -51,5 +50,3 @@ META_EXPORT_TEST gboolean meta_xwayland_signal (MetaXWaylandManager *manager, int signum, GError **error); - -#endif /* META_XWAYLAND_H */ diff --git a/src/x11/events.h b/src/x11/events.h index 7e73edab6..04a657b4d 100644 --- a/src/x11/events.h +++ b/src/x11/events.h @@ -20,12 +20,9 @@ * along with this program; if not, see . */ -#include "meta/display.h" +#pragma once -#ifndef META_EVENTS_X11_H -#define META_EVENTS_X11_H +#include "meta/display.h" void meta_x11_display_init_events (MetaX11Display *x11_display); void meta_x11_display_free_events (MetaX11Display *x11_display); - -#endif diff --git a/src/x11/group-private.h b/src/x11/group-private.h index f8149becc..741303311 100644 --- a/src/x11/group-private.h +++ b/src/x11/group-private.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_GROUP_PRIVATE_H -#define META_GROUP_PRIVATE_H +#pragma once #include "meta/group.h" @@ -33,9 +32,3 @@ struct _MetaGroup char *startup_id; char *wm_client_machine; }; - -#endif - - - - diff --git a/src/x11/group-props.h b/src/x11/group-props.h index 19b570008..20fe48966 100644 --- a/src/x11/group-props.h +++ b/src/x11/group-props.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_GROUP_PROPS_H -#define META_GROUP_PROPS_H +#pragma once #include "core/window-private.h" #include "meta/group.h" @@ -33,5 +32,3 @@ void meta_group_reload_properties (MetaGroup *group, void meta_x11_display_init_group_prop_hooks (MetaX11Display *x11_display); void meta_x11_display_free_group_prop_hooks (MetaX11Display *x11_display); - -#endif /* META_GROUP_PROPS_H */ diff --git a/src/x11/iconcache.h b/src/x11/iconcache.h index a4b63edf0..dea5b5daa 100644 --- a/src/x11/iconcache.h +++ b/src/x11/iconcache.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_ICON_CACHE_H -#define META_ICON_CACHE_H +#pragma once #include "x11/meta-x11-display-private.h" @@ -67,9 +66,3 @@ gboolean meta_read_icons (MetaX11Display *x11_display, cairo_surface_t **mini_iconp, int ideal_mini_width, int ideal_mini_height); - -#endif - - - - diff --git a/src/x11/meta-selection-source-x11-private.h b/src/x11/meta-selection-source-x11-private.h index bcd21a356..9ad1dfe09 100644 --- a/src/x11/meta-selection-source-x11-private.h +++ b/src/x11/meta-selection-source-x11-private.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_SELECTION_SOURCE_X11_H -#define META_SELECTION_SOURCE_X11_H +#pragma once #include "meta/meta-selection-source.h" #include "x11/meta-x11-display-private.h" @@ -40,5 +39,3 @@ void meta_selection_source_x11_new_async (MetaX11Display gpointer user_data); MetaSelectionSource * meta_selection_source_x11_new_finish (GAsyncResult *result, GError **error); - -#endif /* META_SELECTION_SOURCE_X11_H */ diff --git a/src/x11/meta-startup-notification-x11.h b/src/x11/meta-startup-notification-x11.h index b46a45e5d..661b04869 100644 --- a/src/x11/meta-startup-notification-x11.h +++ b/src/x11/meta-startup-notification-x11.h @@ -16,10 +16,12 @@ * along with this program; if not, see . */ -#include "meta-x11-display-private.h" +#pragma once -#ifndef META_X11_STARTUP_NOTIFICATION_H -#define META_X11_STARTUP_NOTIFICATION_H +#include + +#include "core/startup-notification-private.h" +#include "meta/types.h" typedef struct _MetaX11StartupNotification MetaX11StartupNotification; @@ -40,5 +42,3 @@ gchar * meta_x11_startup_notification_launch (MetaX11Display *x11_display, GAppInfo *app_info, uint32_t timestamp, int workspace); - -#endif /* META_X11_STARTUP_NOTIFICATION_H */ diff --git a/src/x11/meta-sync-counter.h b/src/x11/meta-sync-counter.h index a831570c0..e20b4ed8e 100644 --- a/src/x11/meta-sync-counter.h +++ b/src/x11/meta-sync-counter.h @@ -17,8 +17,7 @@ * Author: Carlos Garnacho */ -#ifndef META_SYNC_COUNTER_H -#define META_SYNC_COUNTER_H +#pragma once #include "meta/window.h" @@ -86,5 +85,3 @@ void meta_sync_counter_complete_frame (MetaSyncCounter *sync_counter, void meta_sync_counter_finish_incomplete (MetaSyncCounter *sync_counter); void meta_sync_counter_send_frame_drawn (MetaSyncCounter *sync_counter); - -#endif /* META_SYNC_COUNTER_H */ diff --git a/src/x11/meta-x11-display-private.h b/src/x11/meta-x11-display-private.h index 6822ed4dc..7e476e726 100644 --- a/src/x11/meta-x11-display-private.h +++ b/src/x11/meta-x11-display-private.h @@ -22,8 +22,7 @@ * along with this program; if not, see . */ -#ifndef META_X11_DISPLAY_PRIVATE_H -#define META_X11_DISPLAY_PRIVATE_H +#pragma once #include #include @@ -300,5 +299,3 @@ void meta_x11_display_clear_stage_input_region (MetaX11Display *x11_display); void meta_x11_display_init_error_traps (MetaX11Display *x11_display); void meta_x11_display_destroy_error_traps (MetaX11Display *x11_display); - -#endif /* META_X11_DISPLAY_PRIVATE_H */ diff --git a/src/x11/meta-x11-event-source.h b/src/x11/meta-x11-event-source.h index 60e224a1b..4aac4ec3f 100644 --- a/src/x11/meta-x11-event-source.h +++ b/src/x11/meta-x11-event-source.h @@ -17,8 +17,7 @@ * 02111-1307, USA. */ -#ifndef META_X11_EVENT_SOURCE_H -#define META_X11_EVENT_SOURCE_H +#pragma once #include #include @@ -27,5 +26,3 @@ typedef gboolean (* MetaX11EventFunc) (XEvent *xevent, gpointer user_data); GSource * meta_x11_event_source_new (Display *xdisplay); - -#endif diff --git a/src/x11/meta-x11-selection-input-stream-private.h b/src/x11/meta-x11-selection-input-stream-private.h index ddbb655b8..ade8e25c2 100644 --- a/src/x11/meta-x11-selection-input-stream-private.h +++ b/src/x11/meta-x11-selection-input-stream-private.h @@ -19,8 +19,7 @@ * Christian Kellner */ -#ifndef META_X11_SELECTION_INPUT_STREAM_H -#define META_X11_SELECTION_INPUT_STREAM_H +#pragma once #include @@ -47,5 +46,3 @@ gboolean meta_x11_selection_input_stream_xevent (MetaX11SelectionIn const XEvent *xevent); G_END_DECLS - -#endif /* META_X11_SELECTION_INPUT_STREAM_H */ diff --git a/src/x11/meta-x11-selection-output-stream-private.h b/src/x11/meta-x11-selection-output-stream-private.h index 41bedd9db..6f811be70 100644 --- a/src/x11/meta-x11-selection-output-stream-private.h +++ b/src/x11/meta-x11-selection-output-stream-private.h @@ -19,8 +19,7 @@ * Christian Kellner */ -#ifndef META_X11_SELECTION_OUTPUT_STREAM_H -#define META_X11_SELECTION_OUTPUT_STREAM_H +#pragma once #include @@ -42,6 +41,4 @@ GOutputStream * meta_x11_selection_output_stream_new (MetaX11Display gulong timestamp); gboolean meta_x11_selection_output_stream_xevent (MetaX11SelectionOutputStream *stream, - const XEvent *xevent); - -#endif /* META_X11_SELECTION_OUTPUT_STREAM_H */ + const XEvent *xevent); \ No newline at end of file diff --git a/src/x11/meta-x11-selection-private.h b/src/x11/meta-x11-selection-private.h index b551ef602..1dcd27fc8 100644 --- a/src/x11/meta-x11-selection-private.h +++ b/src/x11/meta-x11-selection-private.h @@ -19,8 +19,7 @@ * Author: Carlos Garnacho */ -#ifndef META_X11_SELECTION_H -#define META_X11_SELECTION_H +#pragma once #include "meta/meta-selection.h" #include "x11/meta-x11-display-private.h" @@ -30,5 +29,3 @@ gboolean meta_x11_selection_handle_event (MetaX11Display *display, void meta_x11_selection_init (MetaX11Display *x11_display); void meta_x11_selection_shutdown (MetaX11Display *x11_display); - -#endif /* META_X11_SELECTION_H */ diff --git a/src/x11/meta-x11-stack-private.h b/src/x11/meta-x11-stack-private.h index a00b8e743..65cd629e1 100644 --- a/src/x11/meta-x11-stack-private.h +++ b/src/x11/meta-x11-stack-private.h @@ -16,8 +16,7 @@ * along with this program; if not, see . */ -#ifndef META_X11_STACK_H -#define META_X11_STACK_H +#pragma once #include @@ -29,5 +28,3 @@ G_DECLARE_FINAL_TYPE (MetaX11Stack, meta_x11_stack, META, X11_STACK, GObject) typedef struct _MetaX11Stack MetaX11Stack; MetaX11Stack * meta_x11_stack_new (MetaX11Display *x11_display); - -#endif /* META_X11_STACK_H */ diff --git a/src/x11/mutter-Xatomtype.h b/src/x11/mutter-Xatomtype.h index ed3e1f781..04802897d 100644 --- a/src/x11/mutter-Xatomtype.h +++ b/src/x11/mutter-Xatomtype.h @@ -57,8 +57,7 @@ SOFTWARE. ******************************************************************/ -#ifndef _XATOMTYPE_H_ -#define _XATOMTYPE_H_ +#pragma once #define BOOL int32_t #define SIGNEDINT int32_t @@ -132,5 +131,3 @@ typedef struct { #undef SIGNEDINT #undef UNSIGNEDINT #undef RESOURCEID - -#endif /* _XATOMTYPE_H_ */ diff --git a/src/x11/session.h b/src/x11/session.h index 8df77efbc..64c839957 100644 --- a/src/x11/session.h +++ b/src/x11/session.h @@ -26,8 +26,7 @@ * along with this program; if not, see . */ -#ifndef META_SESSION_H -#define META_SESSION_H +#pragma once #include "core/window-private.h" @@ -82,9 +81,3 @@ void meta_session_init (MetaContext *context, void meta_session_shutdown (void); - -#endif - - - - diff --git a/src/x11/window-props.h b/src/x11/window-props.h index ded87811f..d11b60a32 100644 --- a/src/x11/window-props.h +++ b/src/x11/window-props.h @@ -27,8 +27,7 @@ * along with this program; if not, see . */ -#ifndef META_WINDOW_PROPS_H -#define META_WINDOW_PROPS_H +#pragma once #include "core/window-private.h" @@ -90,5 +89,3 @@ void meta_x11_display_free_window_prop_hooks (MetaX11Display *x11_display); */ void meta_set_normal_hints (MetaWindow *window, XSizeHints *hints); - -#endif /* META_WINDOW_PROPS_H */ diff --git a/src/x11/window-x11-private.h b/src/x11/window-x11-private.h index 5c738a83f..993c8fd98 100644 --- a/src/x11/window-x11-private.h +++ b/src/x11/window-x11-private.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_WINDOW_X11_PRIVATE_H -#define META_WINDOW_X11_PRIVATE_H +#pragma once #include "core/window-private.h" #include "x11/iconcache.h" @@ -98,5 +97,3 @@ void meta_window_x11_queue_update_icon (MetaWindowX11 *window_x11); void meta_window_x11_initialize_state (MetaWindow *window); G_END_DECLS - -#endif diff --git a/src/x11/window-x11.h b/src/x11/window-x11.h index 6d6725785..63d06cd9c 100644 --- a/src/x11/window-x11.h +++ b/src/x11/window-x11.h @@ -20,8 +20,7 @@ * along with this program; if not, see . */ -#ifndef META_WINDOW_X11_H -#define META_WINDOW_X11_H +#pragma once #include @@ -112,5 +111,3 @@ gboolean meta_window_x11_is_awaiting_sync_response (MetaWindow *window); void meta_window_x11_check_update_resize (MetaWindow *window); gboolean meta_window_x11_has_alpha_channel (MetaWindow *window); - -#endif diff --git a/src/x11/xprops.h b/src/x11/xprops.h index 3ceebde84..2e40a0df8 100644 --- a/src/x11/xprops.h +++ b/src/x11/xprops.h @@ -19,8 +19,7 @@ * along with this program; if not, see . */ -#ifndef META_XPROPS_H -#define META_XPROPS_H +#pragma once #include #include @@ -185,9 +184,3 @@ void meta_prop_get_values (MetaX11Display *x11_display, void meta_prop_free_values (MetaPropValue *values, int n_values); - -#endif - - - -