[mutter] clutter: Remove useless OS_LINUX macro
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter: Remove useless OS_LINUX macro
- Date: Tue, 6 Nov 2018 18:05:59 +0000 (UTC)
commit 1e2610e4f41acceb978d1c5f379d3daae08595c9
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Wed May 23 11:24:09 2018 +0200
clutter: Remove useless OS_LINUX macro
It was unconditionally set to 1.
clutter/configure.ac | 3 ---
clutter/tests/conform/events-touch.c | 8 ++++----
2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/clutter/configure.ac b/clutter/configure.ac
index ed778223e..e65dba65d 100644
--- a/clutter/configure.ac
+++ b/clutter/configure.ac
@@ -29,9 +29,6 @@ AC_PROG_SED
dnl = Preliminary platform checks =============================================
AC_CANONICAL_HOST
-
-AC_DEFINE([OS_LINUX], [1], [Define to 1 if building for Linux])
-
AC_CACHE_SAVE
dnl = Dependencies =========================================================
diff --git a/clutter/tests/conform/events-touch.c b/clutter/tests/conform/events-touch.c
index 124b821af..c87429794 100644
--- a/clutter/tests/conform/events-touch.c
+++ b/clutter/tests/conform/events-touch.c
@@ -21,7 +21,7 @@
#include <clutter/clutter.h>
-#if defined CLUTTER_WINDOWING_X11 && OS_LINUX && HAVE_XINPUT_2_2
+#if defined CLUTTER_WINDOWING_X11 && HAVE_XINPUT_2_2
#include <stdio.h>
#include <string.h>
@@ -355,12 +355,12 @@ error:
return 0;
}
-#endif /* defined CLUTTER_WINDOWING_X11 && OS_LINUX && HAVE_XINPUT_2_2 */
+#endif /* defined CLUTTER_WINDOWING_X11 && HAVE_XINPUT_2_2 */
static void
events_touch (void)
{
-#if defined CLUTTER_WINDOWING_X11 && OS_LINUX && HAVE_XINPUT_2_2
+#if defined CLUTTER_WINDOWING_X11 && HAVE_XINPUT_2_2
ClutterActor *stage;
State state;
@@ -384,7 +384,7 @@ events_touch (void)
g_print ("end result: %s\n", state.pass ? "pass" : "FAIL");
g_assert (state.pass);
-#endif /* defined CLUTTER_WINDOWING_X11 && OS_LINUX && HAVE_XINPUT_2_2 */
+#endif /* defined CLUTTER_WINDOWING_X11 && HAVE_XINPUT_2_2 */
}
CLUTTER_TEST_SUITE (
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]