Mercurial > hg > orthanc
annotate Resources/Patches/e2fsprogs-1.43.8-apple.patch @ 3802:6462ecaa045b
fix unit test, reorganization of OpenSSL initialization
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 02 Apr 2020 12:54:45 +0200 |
parents | ebd2c9ba66c4 |
children |
rev | line source |
---|---|
2917
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 diff -urEb e2fsprogs-1.43.8.orig/lib/uuid/uuid.h.in e2fsprogs-1.43.8/lib/uuid/uuid.h.in |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 --- e2fsprogs-1.43.8.orig/lib/uuid/uuid.h.in 2018-01-02 05:52:58.000000000 +0100 |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 +++ e2fsprogs-1.43.8/lib/uuid/uuid.h.in 2018-11-05 12:18:29.962235770 +0100 |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 @@ -35,6 +35,20 @@ |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
5 #ifndef _UUID_UUID_H |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 #define _UUID_UUID_H |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 + |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 +#if defined(__APPLE__) |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 +// This patch defines the "uuid_string_t" type on OS X, which is |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 +// required if linking against Cocoa (this occurs in Stone of Orthanc) |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 +#include <sys/_types.h> |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 +#include <sys/_types/_uuid_t.h> |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 + |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 +#ifndef _UUID_STRING_T |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 +#define _UUID_STRING_T |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 +typedef __darwin_uuid_string_t uuid_string_t; |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 +#endif /* _UUID_STRING_T */ |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 +#endif |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 + |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 + |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 #include <sys/types.h> |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
23 #ifndef _WIN32 |
ebd2c9ba66c4
patch for compatibility with Cocoa on OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 #include <sys/time.h> |