Mercurial > hg > orthanc-education
view Resources/CMake/Reproc.patch @ 83:95cb8629add4 default tip
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 19 Jun 2026 12:27:54 +0200 |
| parents | 0e293b416012 |
| children |
line wrap: on
line source
diff -r -urEb reproc-14.2.5.orig/reproc/src/error.windows.c reproc-14.2.5/reproc/src/error.windows.c --- reproc-14.2.5.orig/reproc/src/error.windows.c 2025-10-21 22:17:59.386258877 +0200 +++ reproc-14.2.5/reproc/src/error.windows.c 2025-10-21 22:50:15.322957140 +0200 @@ -8,8 +8,8 @@ #include <limits.h> #include <stdlib.h> -#include <windows.h> #include <winsock2.h> +#include <windows.h> #include <reproc/reproc.h> diff -r -urEb reproc-14.2.5.orig/reproc/src/macro.h reproc-14.2.5/reproc/src/macro.h --- reproc-14.2.5.orig/reproc/src/macro.h 2025-10-21 22:17:59.386258877 +0200 +++ reproc-14.2.5/reproc/src/macro.h 2025-10-21 22:37:53.283518598 +0200 @@ -6,6 +6,13 @@ #if defined(_WIN32) && !defined(__MINGW32__) #define THREAD_LOCAL __declspec(thread) +#elif defined(__LSB_VERSION__) +/** + * Linux Standard Base generates the following error if trying to use + * the thread local storage (TLS): "undefined reference to + * `__tls_get_addr'" + **/ + #define THREAD_LOCAL #else #define THREAD_LOCAL __thread #endif diff -r -urEb reproc-14.2.5.orig/reproc/src/pipe.windows.c reproc-14.2.5/reproc/src/pipe.windows.c --- reproc-14.2.5.orig/reproc/src/pipe.windows.c 2025-10-21 22:17:59.386258877 +0200 +++ reproc-14.2.5/reproc/src/pipe.windows.c 2025-10-21 22:50:04.247023847 +0200 @@ -8,8 +8,8 @@ #include <limits.h> #include <stdlib.h> -#include <windows.h> #include <winsock2.h> +#include <windows.h> #include "error.h" #include "handle.h"