Mercurial > hg > orthanc

annotate Resources/Patches/e2fsprogs-1.44.5-apple.patch @ 3704:58f92b1c8061

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 27 Feb 2020 11:25:57 +0100
parents afc38fd21c78
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3289
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb e2fsprogs-1.44.5.orig/lib/uuid/uuid.h.in e2fsprogs-1.44.5/lib/uuid/uuid.h.in
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- e2fsprogs-1.44.5.orig/lib/uuid/uuid.h.in 2019-02-21 20:17:23.461402522 +0100
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ e2fsprogs-1.44.5/lib/uuid/uuid.h.in 2019-02-21 20:25:05.664540445 +0100
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -35,6 +35,20 @@
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 #ifndef _UUID_UUID_H
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 #define _UUID_UUID_H
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 +
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 +#if defined(__APPLE__)
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 +// This patch defines the "uuid_string_t" type on OS X, which is
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 +// required if linking against Cocoa (this occurs in Stone of Orthanc)
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 +#include <sys/_types.h>
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 +#include <sys/_types/_uuid_t.h>
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 +
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 +#ifndef _UUID_STRING_T
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 +#define _UUID_STRING_T
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 +typedef __darwin_uuid_string_t uuid_string_t;
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 +#endif /* _UUID_STRING_T */
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 +#endif
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 +
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 +
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #include <sys/types.h>
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #ifndef _WIN32
afc38fd21c78 upgrade to e2fsprogs 1.44.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #include <sys/time.h>