Commit 8b66351b authored by Cédric Traizet's avatar Cédric Traizet

ENH: remove patch related to GDALDestroy crashes

parent 3a1a42f3
diff -burN gdal-3.0.2_orig/ogr/ogr_proj_p.cpp gdal-3.0.2/ogr/ogr_proj_p.cpp
--- gdal-3.0.2_orig/ogr/ogr_proj_p.cpp 2020-01-31 16:40:41.908287799 +0100
+++ gdal-3.0.2/ogr/ogr_proj_p.cpp 2020-01-31 16:42:52.020291025 +0100
@@ -99,7 +99,7 @@
context = nullptr;
}
-#ifdef WIN32
+#if defined(WIN32) || defined(__APPLE__)
// Currently thread_local and C++ objects don't work well with DLL on Windows
static void FreeProjTLSContextHolder( void* pData )
{
--- gdal-2.4.1_orig/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
+++ gdal-2.4.1/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
@@ -83,7 +83,7 @@ int OGRwillNeverBeTrue = FALSE;
void OGRCleanupAll()
{
- GDALDestroyDriverManager();
+ GDALDestroy();
#if defined(WIN32) && defined(_MSC_VER)
// Horrible hack: for some reason MSVC doesn't export those classes&symbols
// if they are not referenced from the DLL itself
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment