From 53513f858633ae578b87e0c12f43cc77721c84e5 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu, 3 Nov 2011 15:35:03 +0000
Subject: [PATCH] tests: Remove #undef CLUTTER_DISABLE_DEPRECATED

We need to test deprecated API as well, and we don't use a guard any
more in the build.
---
 tests/conform/test-behaviours.c          | 2 --
 tests/conform/test-score.c               | 2 --
 tests/conform/test-script-parser.c       | 2 --
 tests/interactive/test-actor-clone.c     | 1 -
 tests/interactive/test-actors.c          | 1 -
 tests/interactive/test-behave.c          | 1 -
 tests/interactive/test-depth.c           | 2 --
 tests/interactive/test-multistage.c      | 2 --
 tests/interactive/test-paint-wrapper.c   | 1 -
 tests/interactive/test-pixmap.c          | 1 -
 tests/interactive/test-scale.c           | 2 --
 tests/interactive/test-script.c          | 2 --
 tests/interactive/test-texture-quality.c | 2 --
 tests/interactive/test-threads.c         | 2 --
 14 files changed, 23 deletions(-)

diff --git a/tests/conform/test-behaviours.c b/tests/conform/test-behaviours.c
index 7df5e131e..ad0ac16a1 100644
--- a/tests/conform/test-behaviours.c
+++ b/tests/conform/test-behaviours.c
@@ -1,6 +1,4 @@
 #include <glib.h>
-
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 #include "test-conform-common.h"
diff --git a/tests/conform/test-score.c b/tests/conform/test-score.c
index 8756942c3..65384f10c 100644
--- a/tests/conform/test-score.c
+++ b/tests/conform/test-score.c
@@ -1,5 +1,3 @@
-#undef CLUTTER_DISABLE_DEPRECATED
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <clutter/clutter.h>
diff --git a/tests/conform/test-script-parser.c b/tests/conform/test-script-parser.c
index 44abe09cd..b378e74eb 100644
--- a/tests/conform/test-script-parser.c
+++ b/tests/conform/test-script-parser.c
@@ -1,7 +1,5 @@
 #include <stdlib.h>
 #include <string.h>
-
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 #include "test-conform-common.h"
diff --git a/tests/interactive/test-actor-clone.c b/tests/interactive/test-actor-clone.c
index 6e191a954..ec4f392d7 100644
--- a/tests/interactive/test-actor-clone.c
+++ b/tests/interactive/test-actor-clone.c
@@ -1,4 +1,3 @@
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 #include <math.h>
diff --git a/tests/interactive/test-actors.c b/tests/interactive/test-actors.c
index 4ce782aeb..950798c7a 100644
--- a/tests/interactive/test-actors.c
+++ b/tests/interactive/test-actors.c
@@ -1,4 +1,3 @@
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 #include <math.h>
diff --git a/tests/interactive/test-behave.c b/tests/interactive/test-behave.c
index 0ec4e1e07..c6b75907c 100644
--- a/tests/interactive/test-behave.c
+++ b/tests/interactive/test-behave.c
@@ -5,7 +5,6 @@
 #include <glib.h>
 #include <gmodule.h>
 
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 static gboolean
diff --git a/tests/interactive/test-depth.c b/tests/interactive/test-depth.c
index 0f2ed76f1..7684d5d88 100644
--- a/tests/interactive/test-depth.c
+++ b/tests/interactive/test-depth.c
@@ -1,7 +1,5 @@
 #include <stdlib.h>
 #include <gmodule.h>
-
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 /* each time the timeline animating the label completes, swap the direction */
diff --git a/tests/interactive/test-multistage.c b/tests/interactive/test-multistage.c
index f9130cc11..3a877fc81 100644
--- a/tests/interactive/test-multistage.c
+++ b/tests/interactive/test-multistage.c
@@ -1,6 +1,4 @@
 #include <gmodule.h>
-
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 static GList *stages = NULL;
diff --git a/tests/interactive/test-paint-wrapper.c b/tests/interactive/test-paint-wrapper.c
index bbc8fa490..b51562a4c 100644
--- a/tests/interactive/test-paint-wrapper.c
+++ b/tests/interactive/test-paint-wrapper.c
@@ -1,6 +1,5 @@
 #include <gmodule.h>
 
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 #if defined (_MSC_VER) && !defined (_USE_MATH_DEFINES)
diff --git a/tests/interactive/test-pixmap.c b/tests/interactive/test-pixmap.c
index 5a40cad8f..b6ce2daa2 100644
--- a/tests/interactive/test-pixmap.c
+++ b/tests/interactive/test-pixmap.c
@@ -8,7 +8,6 @@
 #include <cairo-xlib.h>
 #endif
 
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 #ifdef CLUTTER_WINDOWING_X11
diff --git a/tests/interactive/test-scale.c b/tests/interactive/test-scale.c
index 23a63542d..506948ba5 100644
--- a/tests/interactive/test-scale.c
+++ b/tests/interactive/test-scale.c
@@ -1,7 +1,5 @@
 #include <stdlib.h>
 #include <gmodule.h>
-
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 static const ClutterGravity gravities[] = {
diff --git a/tests/interactive/test-script.c b/tests/interactive/test-script.c
index e98019697..e30de3dcf 100644
--- a/tests/interactive/test-script.c
+++ b/tests/interactive/test-script.c
@@ -5,8 +5,6 @@
 
 #include <glib.h>
 #include <gmodule.h>
-
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 static ClutterScript *script = NULL;
diff --git a/tests/interactive/test-texture-quality.c b/tests/interactive/test-texture-quality.c
index eb0463036..fd765045a 100644
--- a/tests/interactive/test-texture-quality.c
+++ b/tests/interactive/test-texture-quality.c
@@ -1,7 +1,5 @@
 #include <stdlib.h>
 #include <gmodule.h>
-
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 /* each time the timeline animating the label completes, swap the direction */
diff --git a/tests/interactive/test-threads.c b/tests/interactive/test-threads.c
index 01ca8a766..16359f959 100644
--- a/tests/interactive/test-threads.c
+++ b/tests/interactive/test-threads.c
@@ -1,8 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmodule.h>
-
-#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 /* our thread-specific data */