From: Gaulthier Gain <gaulthier.gain@uliege.be>
Date: Wed, 29 Jan 2020 21:18:33 +0000 (+0100)
Subject: Add patch to update time.h to avoid conflicts with uktime
X-Git-Tag: RELEASE-0.4~18
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=31e2e08679e9bee33d628e9bacac8a6481e45869;p=unikraft%2Flibs%2Fmusl.git

Add patch to update time.h to avoid conflicts with uktime

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@uliege.be>
Reviewed-by: Simon Kuenzer <simon.kuenzer@neclab.eu>
---

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@uliege.be>
+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@uliege.be>
+---
+ 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
+