diff options
| author | Marti Maria <marti.maria@littlecms.com> | 2020-04-02 09:25:28 +0200 |
|---|---|---|
| committer | Marti Maria <marti.maria@littlecms.com> | 2020-04-02 09:25:28 +0200 |
| commit | bc9bf80aa77aa3521e0c847fb2795457987c6b03 (patch) | |
| tree | 5919157756a356079fe61b1c385904a8e0b7e0f0 | |
| parent | 08fe5c96ed4089b21fa6e6b6248a54a5a4396cb4 (diff) | |
| download | lcms2-bc9bf80aa77aa3521e0c847fb2795457987c6b03.tar.gz | |
Update MINGW support
Fixed a situation where MINGW fails
| -rw-r--r-- | include/lcms2.h | 2 | ||||
| -rw-r--r-- | src/cmsplugin.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/lcms2.h b/include/lcms2.h index bb0c415..99e0308 100644 --- a/include/lcms2.h +++ b/include/lcms2.h @@ -61,7 +61,7 @@ // Uncomment this for special windows mutex initialization (see lcms2_internal.h) // #define CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT -// Uncomment this to remove the "CMSREGISTER" storage class +// Uncomment this to remove the "register" storage class // #define CMS_NO_REGISTER_KEYWORD 1 // ********** End of configuration toggles ****************************** diff --git a/src/cmsplugin.c b/src/cmsplugin.c index 381ccef..6725c00 100644 --- a/src/cmsplugin.c +++ b/src/cmsplugin.c @@ -770,6 +770,7 @@ cmsContext CMSEXPORT cmsCreateContext(void* Plugin, void* UserData) // See the comments regarding locking in lcms2_internal.h // for an explanation of why we need the following code. +#ifndef CMS_NO_PTHREADS #ifdef CMS_IS_WINDOWS_ #ifndef CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT { @@ -791,6 +792,7 @@ cmsContext CMSEXPORT cmsCreateContext(void* Plugin, void* UserData) } #endif #endif +#endif _cmsInstallAllocFunctions(_cmsFindMemoryPlugin(Plugin), &fakeContext.DefaultMemoryManager); |