view Resources/Patches/e2fsprogs-1.43.8-apple.patch @ 3524:d96379a965de

merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 24 Sep 2019 18:06:56 +0200
parents ebd2c9ba66c4
children
line wrap: on
line source

diff -urEb e2fsprogs-1.43.8.orig/lib/uuid/uuid.h.in e2fsprogs-1.43.8/lib/uuid/uuid.h.in
--- e2fsprogs-1.43.8.orig/lib/uuid/uuid.h.in	2018-01-02 05:52:58.000000000 +0100
+++ e2fsprogs-1.43.8/lib/uuid/uuid.h.in	2018-11-05 12:18:29.962235770 +0100
@@ -35,6 +35,20 @@
 #ifndef _UUID_UUID_H
 #define _UUID_UUID_H
 
+
+#if defined(__APPLE__)
+// This patch defines the "uuid_string_t" type on OS X, which is
+// required if linking against Cocoa (this occurs in Stone of Orthanc)
+#include <sys/_types.h>
+#include <sys/_types/_uuid_t.h>
+
+#ifndef _UUID_STRING_T
+#define _UUID_STRING_T
+typedef __darwin_uuid_string_t  uuid_string_t;
+#endif /* _UUID_STRING_T */
+#endif
+
+
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/time.h>