[clutter] Remove CLUTTER_DISABLE_DEPRECATED guard

[Emmanuele Bassi <ebassi src gnome org>]

commit 2403d4875b03c14169cf90e55d449ff46a75e23a
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Thu Nov 3 15:32:04 2011 +0000

    Remove CLUTTER_DISABLE_DEPRECATED guard
    
    Except for macros, we now entirely depend on the deprecation warnings
    instead of a guard.

 clutter/clutter-types.h              |    9 +++------
 clutter/clutter.h                    |    2 --
 clutter/deprecated/clutter-actor.h   |    1 -
 clutter/deprecated/clutter-keysyms.h |    4 ++++
 4 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h
index 0ce6655..69665c0 100644
--- a/clutter/clutter-types.h
+++ b/clutter/clutter-types.h
@@ -72,18 +72,15 @@ typedef struct _ClutterEffect           ClutterEffect;
 
 typedef struct _ClutterPath             ClutterPath;
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-typedef struct _ClutterBehaviour        ClutterBehaviour;
-
-typedef struct _ClutterShader           ClutterShader;
-#endif /* DISABLE_DEPRECATED */
-
 typedef struct _ClutterActorBox         ClutterActorBox;
 typedef struct _ClutterColor            ClutterColor;
 typedef struct _ClutterGeometry         ClutterGeometry;
 typedef struct _ClutterKnot             ClutterKnot;
 typedef struct _ClutterVertex           ClutterVertex;
 
+typedef struct _ClutterBehaviour        ClutterBehaviour;
+typedef struct _ClutterShader           ClutterShader;
+
 typedef union _ClutterEvent             ClutterEvent;
 
 /**
diff --git a/clutter/clutter.h b/clutter/clutter.h
index 7c5c85d..231f688 100644
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -103,9 +103,7 @@
 
 #include "clutter-enum-types.h"
 
-#ifndef CLUTTER_DISABLE_DEPRECATED
 #include "clutter-deprecated.h"
-#endif
 
 #undef __CLUTTER_H_INSIDE__
 
diff --git a/clutter/deprecated/clutter-actor.h b/clutter/deprecated/clutter-actor.h
index 1c87205..9d9f001 100644
--- a/clutter/deprecated/clutter-actor.h
+++ b/clutter/deprecated/clutter-actor.h
@@ -11,7 +11,6 @@ guint32         clutter_actor_get_gid           (ClutterActor *self);
 CLUTTER_DEPRECATED
 ClutterActor *  clutter_get_actor_by_gid        (guint32       id_);
 
-
 G_END_DECLS
 
 #endif /* __CLUTTER_ACTOR_DEPRECATED_H__ */
diff --git a/clutter/deprecated/clutter-keysyms.h b/clutter/deprecated/clutter-keysyms.h
index 1094e7c..8c76113 100644
--- a/clutter/deprecated/clutter-keysyms.h
+++ b/clutter/deprecated/clutter-keysyms.h
@@ -29,6 +29,8 @@
 #ifndef __CLUTTER_KEYSYMS_DEPRECATED_H__
 #define __CLUTTER_KEYSYMS_DEPRECATED_H__
 
+#ifndef CLUTTER_DISABLE_DEPRECATED
+
 #define CLUTTER_VoidSymbol 0xffffff
 #define CLUTTER_BackSpace 0xff08
 #define CLUTTER_Tab 0xff09
@@ -2295,4 +2297,6 @@
 #define CLUTTER_LogWindowTree 0x1008fe24
 #define CLUTTER_LogGrabInfo 0x1008fe25
 
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 #endif /* __CLUTTER_KEYSYMS_DEPRECATED_H__ */