8e267afcc2
The tool fails to build on recent distros due to conflicting declaration of __time64_t. Adding a check around the declaration to avoid redefinition. Patch not submitted upstream as the tool is not supported by NXP anymore[1]. Fixes: http://autobuild.buildroot.net/results/ca4498ad21a96ba2a38ca2467dadffdbb516355b/ [1] https://github.com/NXPmicro/mfgtools/pull/104 Signed-off-by: Gary Bisson <bisson.gary@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
28 lines
788 B
Diff
28 lines
788 B
Diff
From 1af7bc09451e0b779f7bfb0dcc58ffb3abe9c584 Mon Sep 17 00:00:00 2001
|
|
From: Gary Bisson <bisson.gary@gmail.com>
|
|
Date: Tue, 11 Feb 2020 15:30:12 +0100
|
|
Subject: [PATCH] lnx_def.h: fix conflicting declaration of __time64_t
|
|
|
|
Signed-off-by: Gary Bisson <bisson.gary@gmail.com>
|
|
---
|
|
MfgToolLib/lnx_def.h | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/MfgToolLib/lnx_def.h b/MfgToolLib/lnx_def.h
|
|
index c6869dd..a38bb99 100644
|
|
--- a/MfgToolLib/lnx_def.h
|
|
+++ b/MfgToolLib/lnx_def.h
|
|
@@ -124,7 +124,9 @@ typedef unsigned long * ULONG_PTR;
|
|
typedef char * LPOLESTR;
|
|
typedef void * HDEVINFO;
|
|
typedef unsigned long long ULONGLONG;
|
|
+#ifndef __time64_t
|
|
typedef long long __time64_t;
|
|
+#endif
|
|
typedef long long __int64;
|
|
typedef unsigned long DWORD_PTR;
|
|
typedef unsigned int UINT;
|
|
--
|
|
2.25.0
|
|
|