clutter: Unconditionally include clutter-build-config.h

2024-11-21 15:40:41 -05:00 · 2018-05-18 16:43:46 +02:00 · 2018-05-18 16:43:46 +02:00 · 11f8b12a9d
commit 11f8b12a9d
parent 0163a0b0cd
120 changed files with 2 additions and 241 deletions
--- a/clutter/clutter/cally/cally-actor.c
+++ b/clutter/clutter/cally/cally-actor.c
@ -67,9 +67,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <glib.h>
 #include <clutter/clutter.h>
--- a/clutter/clutter/cally/cally-text.c
+++ b/clutter/clutter/cally/cally-text.c
@ -39,9 +39,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "cally-text.h"
 #include "cally-actor-private.h"
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally/cally-util.c
@ -38,9 +38,7 @@
 * available any accessible object.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <stdlib.h>
 #include <string.h>
--- a/clutter/clutter/cally/cally.c
+++ b/clutter/clutter/cally/cally.c
@ -29,9 +29,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS

--- a/clutter/clutter/clutter-action.c
+++ b/clutter/clutter/clutter-action.c
@ -41,9 +41,7 @@
 * #ClutterAction is available since Clutter 1.4
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-action.h"

--- a/clutter/clutter/clutter-actor-box.c
+++ b/clutter/clutter/clutter-actor-box.c
@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/clutter-actor-meta.c
+++ b/clutter/clutter/clutter-actor-meta.c
@ -41,9 +41,7 @@
 * #ClutterActorMeta is available since Clutter 1.4
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-actor-meta-private.h"

--- a/clutter/clutter/clutter-align-constraint.c
+++ b/clutter/clutter/clutter-align-constraint.c
@ -34,9 +34,7 @@
 * #ClutterAlignConstraint is available since Clutter 1.4
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-align-constraint.h"

--- a/clutter/clutter/clutter-animatable.c
+++ b/clutter/clutter/clutter-animatable.c
@ -45,9 +45,7 @@
 * #ClutterAnimatable is available since Clutter 1.0
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS

--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@ -38,9 +38,7 @@
 * #ClutterBackend is available since Clutter 0.4
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_ENABLE_EXPERIMENTAL_API

--- a/clutter/clutter/clutter-base-types.c
+++ b/clutter/clutter/clutter-base-types.c
@ -30,9 +30,7 @@
 * across the whole API.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-types.h"
 #include "clutter-private.h"
--- a/clutter/clutter/clutter-bin-layout.c
+++ b/clutter/clutter/clutter-bin-layout.c
@ -43,9 +43,7 @@
 * #ClutterBinLayout is available since Clutter 1.2
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/clutter-bind-constraint.c
+++ b/clutter/clutter/clutter-bind-constraint.c
@ -80,9 +80,7 @@
 * #ClutterBindConstraint is available since Clutter 1.4
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/clutter-binding-pool.c
+++ b/clutter/clutter/clutter-binding-pool.c
@ -94,9 +94,7 @@
 * #ClutterBindingPool is available since Clutter 1.0
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-binding-pool.h"
 #include "clutter-debug.h"
--- a/clutter/clutter/clutter-blur-effect.c
+++ b/clutter/clutter/clutter-blur-effect.c
@ -37,9 +37,7 @@
 #define CLUTTER_IS_BLUR_EFFECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BLUR_EFFECT))
 #define CLUTTER_BLUR_EFFECT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BLUR_EFFECT, ClutterBlurEffectClass))

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_ENABLE_EXPERIMENTAL_API

--- a/clutter/clutter/clutter-box-layout.c
+++ b/clutter/clutter/clutter-box-layout.c
@ -48,9 +48,7 @@
 * #ClutterBoxLayout is available since Clutter 1.2
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/clutter-brightness-contrast-effect.c
+++ b/clutter/clutter/clutter-brightness-contrast-effect.c
@ -37,9 +37,7 @@
 #define CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT))
 #define CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, ClutterBrightnessContrastEffectClass))

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/clutter-cairo.c
+++ b/clutter/clutter/clutter-cairo.c
@ -27,9 +27,7 @@
 * Clutter provides some utility functions for using Cairo.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-cairo.h"
 #include "clutter-color.h"
--- a/clutter/clutter/clutter-canvas.c
+++ b/clutter/clutter/clutter-canvas.c
@ -42,9 +42,7 @@
 * #ClutterCanvas is available since Clutter 1.10.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <cogl/cogl.h>
 #include <cairo-gobject.h>
--- a/clutter/clutter/clutter-child-meta.c
+++ b/clutter/clutter/clutter-child-meta.c
@ -36,9 +36,8 @@
 *
 * #ClutterChildMeta is available since Clutter 0.8
 */
-#ifdef HAVE_CONFIG_H
+
 #include "clutter-build-config.h"
-#endif

 #include "clutter-child-meta.h"
 #include "clutter-container.h"
--- a/clutter/clutter/clutter-click-action.c
+++ b/clutter/clutter/clutter-click-action.c
@ -92,9 +92,7 @@
 * #ClutterClickAction is available since Clutter 1.4
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-click-action.h"

--- a/clutter/clutter/clutter-clone.c
+++ b/clutter/clutter/clutter-clone.c
@ -37,9 +37,7 @@
 * #ClutterClone is available since Clutter 1.0
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include "clutter-actor-private.h"
--- a/clutter/clutter/clutter-color.c
+++ b/clutter/clutter/clutter-color.c
@ -33,9 +33,7 @@
 * The alpha channel is fully opaque at 255 and fully transparent at 0.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/clutter-colorize-effect.c
+++ b/clutter/clutter/clutter-colorize-effect.c
@ -37,9 +37,7 @@
 #define CLUTTER_IS_COLORIZE_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_COLORIZE_EFFECT))
 #define CLUTTER_COLORIZE_EFFECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_COLORIZE_EFFECT, ClutterColorizeEffectClass))

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_ENABLE_EXPERIMENTAL_API

--- a/clutter/clutter/clutter-constraint.c
+++ b/clutter/clutter/clutter-constraint.c
@ -128,9 +128,7 @@
 * can be recovered at any point using clutter_actor_meta_get_actor().
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <string.h>

--- a/clutter/clutter/clutter-container.c
+++ b/clutter/clutter/clutter-container.c
@ -26,9 +26,7 @@
 * Author: Emmanuele Bassi <ebassi@openedhand.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <stdarg.h>
 #include <glib-object.h>
--- a/clutter/clutter/clutter-content.c
+++ b/clutter/clutter/clutter-content.c
@ -36,9 +36,7 @@
 * #ClutterContent is available since Clutter 1.10.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-content-private.h"

--- a/clutter/clutter/clutter-deform-effect.c
+++ b/clutter/clutter/clutter-deform-effect.c
@ -51,9 +51,7 @@
 * deformation algorithm.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include "clutter-deform-effect.h"
--- a/clutter/clutter/clutter-desaturate-effect.c
+++ b/clutter/clutter/clutter-desaturate-effect.c
@ -39,9 +39,7 @@
 #define CLUTTER_IS_DESATURATE_EFFECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_DESATURATE_EFFECT))
 #define CLUTTER_DESATURATE_EFFECT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_DESATURATE_EFFECT, ClutterDesaturateEffectClass))

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_ENABLE_EXPERIMENTAL_API

--- a/clutter/clutter/clutter-device-manager.c
+++ b/clutter/clutter/clutter-device-manager.c
@ -36,9 +36,7 @@
 * #ClutterDeviceManager is available since Clutter 1.2
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-backend-private.h"
 #include "clutter-debug.h"
--- a/clutter/clutter/clutter-drag-action.c
+++ b/clutter/clutter/clutter-drag-action.c
@ -63,9 +63,7 @@
 * #ClutterDragAction is available since Clutter 1.4
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-drag-action.h"

--- a/clutter/clutter/clutter-drop-action.c
+++ b/clutter/clutter/clutter-drop-action.c
@ -58,9 +58,7 @@
 * #ClutterDropAction is available since Clutter 1.8
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-drop-action.h"

--- a/clutter/clutter/clutter-effect.c
+++ b/clutter/clutter/clutter-effect.c
@ -160,9 +160,7 @@
 * #ClutterEffect is available since Clutter 1.4
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-effect.h"

--- a/clutter/clutter/clutter-event.c
+++ b/clutter/clutter/clutter-event.c
@ -23,9 +23,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-backend-private.h"
 #include "clutter-debug.h"
--- a/clutter/clutter/clutter-feature.c
+++ b/clutter/clutter/clutter-feature.c
@ -37,9 +37,7 @@
 * See also cogl_get_features() and #CoglFeatureFlags
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <stdlib.h>
 #include <string.h>
--- a/clutter/clutter/clutter-fixed-layout.c
+++ b/clutter/clutter/clutter-fixed-layout.c
@ -34,9 +34,7 @@
 * #ClutterFixedLayout is available since Clutter 1.2
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-debug.h"
 #include "clutter-fixed-layout.h"
--- a/clutter/clutter/clutter-flatten-effect.c
+++ b/clutter/clutter/clutter-flatten-effect.c
@ -27,9 +27,7 @@
   need to do anything on top of the ClutterOffscreenEffect class so
   it only exists because that class is abstract */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-flatten-effect.h"
 #include "clutter-private.h"
--- a/clutter/clutter/clutter-flow-layout.c
+++ b/clutter/clutter/clutter-flow-layout.c
@ -52,9 +52,7 @@
 * #ClutterFlowLayout is available since Clutter 1.2
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/clutter-gesture-action.c
+++ b/clutter/clutter/clutter-gesture-action.c
@ -83,9 +83,7 @@
 * Since: 1.8
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-gesture-action-private.h"

--- a/clutter/clutter/clutter-grid-layout.c
+++ b/clutter/clutter/clutter-grid-layout.c
@ -26,9 +26,7 @@
 *   Matthias Clasen
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <string.h>
 #include <math.h>
--- a/clutter/clutter/clutter-id-pool.c
+++ b/clutter/clutter/clutter-id-pool.c
@ -28,9 +28,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-debug.h"
 #include "clutter-id-pool.h"
--- a/clutter/clutter/clutter-image.c
+++ b/clutter/clutter/clutter-image.c
@ -36,9 +36,7 @@
 * #ClutterImage is available since Clutter 1.10.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_ENABLE_EXPERIMENTAL_API

--- a/clutter/clutter/clutter-input-device-tool.c
+++ b/clutter/clutter/clutter-input-device-tool.c
@ -21,9 +21,7 @@
 * Author: Carlos Garnacho <carlosg@gnome.org>
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-input-device-tool.h"
 #include "clutter-private.h"
--- a/clutter/clutter/clutter-input-device.c
+++ b/clutter/clutter/clutter-input-device.c
@ -31,9 +31,7 @@
 * its contents are usually defined by the Clutter backend in use.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-input-device.h"

--- a/clutter/clutter/clutter-keyframe-transition.c
+++ b/clutter/clutter/clutter-keyframe-transition.c
@ -62,9 +62,7 @@
 * #ClutterKeyframeTransition is available since Clutter 1.12.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-keyframe-transition.h"

--- a/clutter/clutter/clutter-layout-manager.c
+++ b/clutter/clutter/clutter-layout-manager.c
@ -129,9 +129,7 @@
 * #ClutterLayoutManager is available since Clutter 1.2
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
--- a/clutter/clutter/clutter-layout-meta.c
+++ b/clutter/clutter/clutter-layout-meta.c
@ -34,9 +34,8 @@
 *
 * #ClutterLayoutMeta is available since Clutter 1.2
 */
-#ifdef HAVE_CONFIG_H
+
 #include "clutter-build-config.h"
-#endif

 #include "clutter-layout-meta.h"
 #include "clutter-debug.h"
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@ -47,9 +47,7 @@
 * [threads.c](https://git.gnome.org/browse/clutter/tree/examples/threads.c?h=clutter-1.18)
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <stdlib.h>

--- a/clutter/clutter/clutter-master-clock-default.c
+++ b/clutter/clutter/clutter-master-clock-default.c
@ -29,9 +29,7 @@
 * of #ClutterMasterClock.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-master-clock.h"
 #include "clutter-master-clock-default.h"
--- a/clutter/clutter/clutter-master-clock.c
+++ b/clutter/clutter/clutter-master-clock.c
@ -31,9 +31,7 @@
 * painting it.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-master-clock.h"
 #include "clutter-master-clock-default.h"
--- a/clutter/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter/clutter-offscreen-effect.c
@ -62,9 +62,7 @@
 * case.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-offscreen-effect.h"

--- a/clutter/clutter/clutter-page-turn-effect.c
+++ b/clutter/clutter/clutter-page-turn-effect.c
@ -35,9 +35,7 @@
 * #ClutterPageTurnEffect is available since Clutter 1.4
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/clutter-paint-node.c
+++ b/clutter/clutter/clutter-paint-node.c
@ -58,9 +58,7 @@
 * Since: 1.10
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_ENABLE_EXPERIMENTAL_API

--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@ -31,9 +31,7 @@
 * that cover all the state changes available.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_ENABLE_EXPERIMENTAL_API

--- a/clutter/clutter/clutter-paint-volume.c
+++ b/clutter/clutter/clutter-paint-volume.c
@ -24,9 +24,7 @@
 *      Emmanuele Bassi <ebassi@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <string.h>

--- a/clutter/clutter/clutter-pan-action.c
+++ b/clutter/clutter/clutter-pan-action.c
@ -53,9 +53,7 @@
 * Since: 1.12
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-pan-action.h"

--- a/clutter/clutter/clutter-path-constraint.c
+++ b/clutter/clutter/clutter-path-constraint.c
@ -36,9 +36,7 @@
 * ClutterPathConstraint is available since Clutter 1.6.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-path-constraint.h"

--- a/clutter/clutter/clutter-path.c
+++ b/clutter/clutter/clutter-path.c
@ -61,9 +61,7 @@
 * #ClutterPath is available since Clutter 1.0
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <string.h>
 #include <stdarg.h>
--- a/clutter/clutter/clutter-property-transition.c
+++ b/clutter/clutter/clutter-property-transition.c
@ -30,9 +30,7 @@
 * #ClutterPropertyTransition is available since Clutter 1.10
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-property-transition.h"

--- a/clutter/clutter/clutter-rotate-action.c
+++ b/clutter/clutter/clutter-rotate-action.c
@ -33,9 +33,7 @@
 * Since: 1.12
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/clutter-script-parser.c
+++ b/clutter/clutter/clutter-script-parser.c
@ -24,9 +24,7 @@
 *      Emmanuele Bassi <ebassi@linux.intel.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <string.h>
 #include <stdlib.h>
--- a/clutter/clutter/clutter-script.c
+++ b/clutter/clutter/clutter-script.c
@ -220,9 +220,7 @@
 * #ClutterScript is available since Clutter 0.6
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <stdlib.h>
 #include <string.h>
--- a/clutter/clutter/clutter-scriptable.c
+++ b/clutter/clutter/clutter-scriptable.c
@ -36,9 +36,7 @@
 * #ClutterScriptable is available since Clutter 0.6
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <string.h>
 #include <stdlib.h>
--- a/clutter/clutter/clutter-scroll-actor.c
+++ b/clutter/clutter/clutter-scroll-actor.c
@ -42,9 +42,7 @@
 * #ClutterScrollActor is available since Clutter 1.12.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-scroll-actor.h"

--- a/clutter/clutter/clutter-settings.c
+++ b/clutter/clutter/clutter-settings.c
@ -17,9 +17,7 @@
 * #ClutterSettings is available since Clutter 1.4
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-settings.h"

--- a/clutter/clutter/clutter-shader-effect.c
+++ b/clutter/clutter/clutter-shader-effect.c
@ -111,9 +111,7 @@
 * ]|
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "cogl/cogl.h"

--- a/clutter/clutter/clutter-shader-types.c
+++ b/clutter/clutter/clutter-shader-types.c
@ -24,9 +24,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
--- a/clutter/clutter/clutter-snap-constraint.c
+++ b/clutter/clutter/clutter-snap-constraint.c
@ -35,9 +35,7 @@
 * #ClutterSnapConstraint is available since Clutter 1.6
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/clutter-stage-manager.c
+++ b/clutter/clutter/clutter-stage-manager.c
@ -36,9 +36,7 @@
 * #ClutterStageManager is available since Clutter 0.8
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-stage-manager-private.h"

--- a/clutter/clutter/clutter-stage-window.c
+++ b/clutter/clutter/clutter-stage-window.c
@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <glib-object.h>

--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@ -42,9 +42,7 @@
 * the parent class corresponding function.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>
 #include <cairo.h>
--- a/clutter/clutter/clutter-swipe-action.c
+++ b/clutter/clutter/clutter-swipe-action.c
@ -37,9 +37,7 @@
 * Since: 1.8
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-swipe-action.h"

--- a/clutter/clutter/clutter-tap-action.c
+++ b/clutter/clutter/clutter-tap-action.c
@ -53,9 +53,7 @@
 * Since: 1.14
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-tap-action.h"

--- a/clutter/clutter/clutter-text-buffer.c
+++ b/clutter/clutter/clutter-text-buffer.c
@ -19,9 +19,7 @@
 * Author: Stef Walter <stefw@collabora.co.uk>
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-text-buffer.h"
 #include "clutter-marshal.h"
--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/clutter-text.c
@ -38,9 +38,7 @@
 * #ClutterText is available since Clutter 1.0
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <string.h>
 #include <math.h>
--- a/clutter/clutter/clutter-timeline.c
+++ b/clutter/clutter/clutter-timeline.c
@ -93,9 +93,7 @@
 * ]|
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-timeline.h"

--- a/clutter/clutter/clutter-transition-group.c
+++ b/clutter/clutter/clutter-transition-group.c
@ -37,9 +37,7 @@
 * #ClutterTransitionGroup is available since Clutter 1.12
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-transition-group.h"

--- a/clutter/clutter/clutter-transition.c
+++ b/clutter/clutter/clutter-transition.c
@ -30,9 +30,7 @@
 * computes the interpolation between two values, stored by a #ClutterInterval.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-transition.h"

--- a/clutter/clutter/clutter-units.c
+++ b/clutter/clutter/clutter-units.c
@ -62,9 +62,7 @@
 * #ClutterUnits is available since Clutter 1.0
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <stdlib.h>

--- a/clutter/clutter/clutter-util.c
+++ b/clutter/clutter/clutter-util.c
@ -30,9 +30,7 @@
 * Various miscellaneous utilility functions.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/clutter-virtual-input-device.c
+++ b/clutter/clutter/clutter-virtual-input-device.c
@ -21,9 +21,7 @@
 * Author: Jonas Ådahl <jadahl@gmail.com>
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <glib-object.h>

--- a/clutter/clutter/clutter-zoom-action.c
+++ b/clutter/clutter/clutter-zoom-action.c
@ -46,9 +46,7 @@
 * Since: 1.12
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/clutter/cogl/clutter-stage-cogl.c
@ -25,10 +25,7 @@
 *  Emmanuele Bassi
 */

-
-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_ENABLE_EXPERIMENTAL_API

--- a/clutter/clutter/deprecated/clutter-actor-deprecated.c
+++ b/clutter/clutter/deprecated/clutter-actor-deprecated.c
@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <glib-object.h>

--- a/clutter/clutter/deprecated/clutter-alpha.c
+++ b/clutter/clutter/deprecated/clutter-alpha.c
@ -95,9 +95,7 @@
 * ]|
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/deprecated/clutter-animation.c
+++ b/clutter/clutter/deprecated/clutter-animation.c
@ -97,9 +97,7 @@
 *  - easeInBounce, easeOutBounce, easeInOutBounce
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
--- a/clutter/clutter/deprecated/clutter-animator.c
+++ b/clutter/clutter/deprecated/clutter-animator.c
@ -115,9 +115,7 @@
 * ]|
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <string.h>
 #include <math.h>
--- a/clutter/clutter/deprecated/clutter-behaviour-depth.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-depth.c
@ -23,9 +23,7 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS

--- a/clutter/clutter/deprecated/clutter-behaviour-ellipse.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-ellipse.c
@ -43,9 +43,7 @@
 * Since: 0.4
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>
 #include <stdlib.h>
--- a/clutter/clutter/deprecated/clutter-behaviour-opacity.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-opacity.c
@ -36,9 +36,7 @@
 *   instead.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/deprecated/clutter-behaviour-path.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-path.c
@ -63,9 +63,7 @@
 *   clutter_actor_animate() instead.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS

--- a/clutter/clutter/deprecated/clutter-behaviour-rotate.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-rotate.c
@ -35,9 +35,7 @@
 *   instead.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/deprecated/clutter-behaviour-scale.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-scale.c
@ -35,9 +35,7 @@
 *   #ClutterState instead.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/deprecated/clutter-behaviour.c
+++ b/clutter/clutter/deprecated/clutter-behaviour.c
@ -70,9 +70,7 @@
 * if you still have code using #ClutterBehaviour.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "clutter-behaviour.h"
--- a/clutter/clutter/deprecated/clutter-box.c
+++ b/clutter/clutter/deprecated/clutter-box.c
@ -69,9 +69,7 @@
 * layout properties while adding the new child to the box.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
--- a/clutter/clutter/deprecated/clutter-cairo-texture.c
+++ b/clutter/clutter/deprecated/clutter-cairo-texture.c
@ -57,9 +57,7 @@
 * use #ClutterCanvas instead.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <math.h>

--- a/clutter/clutter/deprecated/clutter-frame-source.c
+++ b/clutter/clutter/deprecated/clutter-frame-source.c
@ -23,9 +23,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS

--- a/clutter/clutter/deprecated/clutter-group.c
+++ b/clutter/clutter/deprecated/clutter-group.c
@ -47,9 +47,7 @@
 * manage child actors.
 */

-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <stdarg.h>

--- a/clutter/clutter/deprecated/clutter-input-device-deprecated.c
+++ b/clutter/clutter/deprecated/clutter-input-device-deprecated.c
@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include <glib-object.h>

--- a/clutter/clutter/deprecated/clutter-layout-manager-deprecated.c
+++ b/clutter/clutter/deprecated/clutter-layout-manager-deprecated.c
@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
-#endif

 #include "clutter-layout-manager.h"

--- a/Show More
+++ b/Show More