Re: [Xenomai] [PATCH] cobalt/kernel: fix clock_adjtime() compile error

2018-03-04 Thread Philippe Gerum
On 03/02/2018 02:22 PM, Henning Schild wrote:
> Moving the definition out of the ifdef solves the following error:
> 
> include/xenomai/cobalt/kernel/clock.h:260:16: error:
>  ‘struct ’ has no member named ‘adjust_time’
> include/xenomai/cobalt/kernel/clock.h:263:19: error:
>  ‘struct ’ has no member named ‘adjust_time’
> 
> Signed-off-by: Henning Schild 
> ---
>  include/cobalt/kernel/clock.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/cobalt/kernel/clock.h b/include/cobalt/kernel/clock.h
> index bf03c5921..bbdec9357 100644
> --- a/include/cobalt/kernel/clock.h
> +++ b/include/cobalt/kernel/clock.h
> @@ -53,8 +53,6 @@ struct xnclock {
>   xnticks_t (*read_monotonic)(struct xnclock *clock);
>   int (*set_time)(struct xnclock *clock,
>   const struct timespec *ts);
> - int (*adjust_time)(struct xnclock *clock,
> -struct timex *tx);
>   xnsticks_t (*ns_to_ticks)(struct xnclock *clock,
> xnsticks_t ns);
>   xnsticks_t (*ticks_to_ns)(struct xnclock *clock,
> @@ -66,6 +64,8 @@ struct xnclock {
>   void (*program_remote_shot)(struct xnclock *clock,
>   struct xnsched *sched);
>  #endif
> + int (*adjust_time)(struct xnclock *clock,
> +struct timex *tx);
>   int (*set_gravity)(struct xnclock *clock,
>  const struct xnclock_gravity *p);
>   void (*reset_gravity)(struct xnclock *clock);
> 

Merged, thanks.

-- 
Philippe.

___
Xenomai mailing list
Xenomai@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai


Re: [Xenomai] [PATCH] cobalt/kernel: fix clock_adjtime() compile error

2018-03-02 Thread Henning Schild
Applies on top of current "next".

Henning

Am Fri, 2 Mar 2018 14:22:05 +0100
schrieb Henning Schild :

> Moving the definition out of the ifdef solves the following error:
> 
> include/xenomai/cobalt/kernel/clock.h:260:16: error:
>  ‘struct ’ has no member named ‘adjust_time’
> include/xenomai/cobalt/kernel/clock.h:263:19: error:
>  ‘struct ’ has no member named ‘adjust_time’
> 
> Signed-off-by: Henning Schild 
> ---
>  include/cobalt/kernel/clock.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/cobalt/kernel/clock.h
> b/include/cobalt/kernel/clock.h index bf03c5921..bbdec9357 100644
> --- a/include/cobalt/kernel/clock.h
> +++ b/include/cobalt/kernel/clock.h
> @@ -53,8 +53,6 @@ struct xnclock {
>   xnticks_t (*read_monotonic)(struct xnclock *clock);
>   int (*set_time)(struct xnclock *clock,
>   const struct timespec *ts);
> - int (*adjust_time)(struct xnclock *clock,
> -struct timex *tx);
>   xnsticks_t (*ns_to_ticks)(struct xnclock *clock,
> xnsticks_t ns);
>   xnsticks_t (*ticks_to_ns)(struct xnclock *clock,
> @@ -66,6 +64,8 @@ struct xnclock {
>   void (*program_remote_shot)(struct xnclock *clock,
>   struct xnsched *sched);
>  #endif
> + int (*adjust_time)(struct xnclock *clock,
> +struct timex *tx);
>   int (*set_gravity)(struct xnclock *clock,
>  const struct xnclock_gravity *p);
>   void (*reset_gravity)(struct xnclock *clock);


___
Xenomai mailing list
Xenomai@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai