mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
f241408f18
Resolve conflicts with the uuid type from darwin system headers
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 16c37ba913)
22 lines
389 B
Diff
22 lines
389 B
Diff
--- a/tools/fiptool/fiptool.c
|
|
+++ b/tools/fiptool/fiptool.c
|
|
@@ -3,7 +3,7 @@
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
-
|
|
+#define _DARWIN_C_SOURCE
|
|
#ifndef _MSC_VER
|
|
#include <sys/mount.h>
|
|
#endif
|
|
@@ -18,6 +18,9 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
+#include <unistd.h>
|
|
+
|
|
+#define uuid_t fiptool_uuid_t
|
|
|
|
#include "fiptool.h"
|
|
#include "tbbr_config.h"
|