Mercurial > hg > orthanc

annotate Resources/Patches/libp11-0.4.0.patch @ 2029:df9c1738d92e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author sjodogne
date Mon, 20 Jun 2016 14:07:48 +0200
parents d46746607ae0
children cc6d4edfe8fe
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2026
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb libp11-0.4.0.orig/src/atfork.c libp11-0.4.0/src/atfork.c
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- libp11-0.4.0.orig/src/atfork.c 2016-06-20 13:38:43.845575107 +0200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ libp11-0.4.0/src/atfork.c 2016-06-20 13:46:52.969575591 +0200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -25,7 +25,7 @@
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 #include <sys/stat.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 #include <sys/types.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 #include <unistd.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 -#include <atfork.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 +#include "atfork.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 #ifdef __sun
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 # pragma fini(lib_deinit)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 diff -urEb libp11-0.4.0.orig/src/engine.h libp11-0.4.0/src/engine.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 --- libp11-0.4.0.orig/src/engine.h 2016-06-20 13:38:43.845575107 +0200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 +++ libp11-0.4.0/src/engine.h 2016-06-20 13:46:27.421575566 +0200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 @@ -29,7 +29,7 @@
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 #define _ENGINE_PKCS11_H
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 #ifndef _WIN32
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 -#include "config.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 +//#include "config.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #include "libp11.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 diff -urEb libp11-0.4.0.orig/src/libp11-int.h libp11-0.4.0/src/libp11-int.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 --- libp11-0.4.0.orig/src/libp11-int.h 2016-06-20 13:38:43.845575107 +0200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 +++ libp11-0.4.0/src/libp11-int.h 2016-06-20 13:46:27.421575566 +0200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 @@ -20,7 +20,7 @@
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 #define _LIBP11_INT_H
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 #ifndef _WIN32
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 -#include "config.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 +//#include "config.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 #include "libp11.h"