compositor/clients: Protect CLOCK_BOOTTIME with ifdefs
authorDerek Foreman <derekf@osg.samsung.com>
Mon, 29 Jun 2015 18:20:34 +0000 (13:20 -0500)
committerDerek Foreman <derekf@osg.samsung.com>
Wed, 21 Oct 2015 21:44:14 +0000 (16:44 -0500)
CLOCK_BOOTTIME is a relatively new* feature that may not actually be
present everywhere (I'm looking at you wheezy).  Since our use of it
is actually only cosmetic, I've just ifdef'd if.

* No it isn't.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
clients/weston-info.c
src/main.c

index 89ef8f1..f22781c 100644 (file)
@@ -579,7 +579,9 @@ clock_name(clockid_t clk_id)
                [CLOCK_MONOTONIC_RAW] =         "CLOCK_MONOTONIC_RAW",
                [CLOCK_REALTIME_COARSE] =       "CLOCK_REALTIME_COARSE",
                [CLOCK_MONOTONIC_COARSE] =      "CLOCK_MONOTONIC_COARSE",
+#ifdef CLOCK_BOOTTIME
                [CLOCK_BOOTTIME] =              "CLOCK_BOOTTIME",
+#endif
        };
 
        if (clk_id < 0 || (unsigned)clk_id >= ARRAY_LENGTH(names))
index 1591018..329db14 100644 (file)
@@ -393,7 +393,9 @@ clock_name(clockid_t clk_id)
                [CLOCK_MONOTONIC_RAW] =         "CLOCK_MONOTONIC_RAW",
                [CLOCK_REALTIME_COARSE] =       "CLOCK_REALTIME_COARSE",
                [CLOCK_MONOTONIC_COARSE] =      "CLOCK_MONOTONIC_COARSE",
+#ifdef CLOCK_BOOTTIME
                [CLOCK_BOOTTIME] =              "CLOCK_BOOTTIME",
+#endif
        };
 
        if (clk_id < 0 || (unsigned)clk_id >= ARRAY_LENGTH(names))