Mercurial > hg > orthanc
changeset 5982:f3dbc9a58195
fix msvc
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 21 Jan 2025 16:44:30 +0100 |
| parents | a9c9952aa113 |
| children | 5a6aa72628cb |
| files | OrthancFramework/Resources/Patches/dcmtk-3.6.9.patch |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Resources/Patches/dcmtk-3.6.9.patch Tue Jan 21 16:10:01 2025 +0100 +++ b/OrthancFramework/Resources/Patches/dcmtk-3.6.9.patch Tue Jan 21 16:44:30 2025 +0100 @@ -87,13 +87,13 @@ #define OFICONV_CITRUS_WC_T_DEFINED diff -urEb dcmtk-3.6.9.orig/oficonv/libsrc/citrus_lock.h dcmtk-3.6.9/oficonv/libsrc/citrus_lock.h --- dcmtk-3.6.9.orig/oficonv/libsrc/citrus_lock.h 2025-01-21 15:53:12.646715143 +0100 -+++ dcmtk-3.6.9/oficonv/libsrc/citrus_lock.h 2025-01-21 16:03:17.310652376 +0100 ++++ dcmtk-3.6.9/oficonv/libsrc/citrus_lock.h 2025-01-21 16:43:36.463693959 +0100 @@ -31,7 +31,7 @@ #ifdef WITH_THREADS -#ifdef HAVE_WINDOWS_H -+#if defined(HAVE_WINDOWS_H) && defined(HAVE_PROTOTYPE_TRYACQUIRESRWLOCKSHARE) ++#if defined(HAVE_WINDOWS_H) && !defined(HAVE_PTHREAD_H) /* Favor pthread if available, for MinGW */ #include <windows.h> #define WLOCK(lock) AcquireSRWLockExclusive(lock);