Re: [Minios-devel] [UNIKRAFT/MUSL PATCH V2 10/28] Add patch to update time.h to avoid conflicts with uktime

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Reviewed-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>

On 29.01.20 22:18, Gaulthier Gain wrote:
> This patch updates time.h in order to avoid redefinition errors with
> musl-imported time.h.
>
> Note that we included '<bits/alltypes>' otherwise 'locale_t' type is
> unknown. A next task will be to find a cleaner approach.
>
> Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
> ---
>   patches/0004-Fix-time_h-conflicts.patch | 32 +++++++++++++++++++++++++
>   1 file changed, 32 insertions(+)
>   create mode 100644 patches/0004-Fix-time_h-conflicts.patch
>
> diff --git a/patches/0004-Fix-time_h-conflicts.patch 
> b/patches/0004-Fix-time_h-conflicts.patch
> new file mode 100644
> index 0000000..972b11e
> --- /dev/null
> +++ b/patches/0004-Fix-time_h-conflicts.patch
> @@ -0,0 +1,32 @@
> +From 23eaaa076aaabd44eb89aea6663db13b50618566 Mon Sep 17 00:00:00 2001
> +From: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
> +Date: Tue, 21 Jan 2020 16:33:44 +0100
> +Subject: [PATCH] Update time.h to avoid conflicts with musl-imported
> + time.h
> +
> +Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
> +---
> + include/time.h | 10 ++++++++--
> + 1 file changed, 8 insertions(+), 2 deletions(-)
> +
> +diff --git a/include/time.h b/include/time.h
> +index 672b3fc..bbaff7d 100644
> +--- a/include/time.h
> ++++ b/include/time.h
> +@@ -1,5 +1,11 @@
> +-#ifndef       _TIME_H
> +-#define _TIME_H
> ++/*
> ++ * TODO: We need to include '<bits/alltypes>' otherwise 'locale_t'
> ++ * type is unknown. Check if there exists a cleaner approach.
> ++ */
> ++#include <bits/alltypes.h>
> ++
> ++#ifndef _UKTIME_TIME_H
> ++#define _UKTIME_TIME_H
> +
> + #ifdef __cplusplus
> + extern "C" {
> +--
> +2.20.1
> +
_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel