blob: 66515a7e8db0d0194ed1af4bd9447d44e9aa76e1 [file] [log] [blame] [edit]
From f561633d59490fe57901302f7aa50fe178a273f3 Mon Sep 17 00:00:00 2001
From: Diego Sogari <dsogari@nelogica.com.br>
Date: Thu, 29 Oct 2020 10:56:08 -0300
Subject: [PATCH] Add support for THREADSAFE option in MinGW build
---
lang/c/CMakeLists.txt | 4 ++--
lang/c/src/errors.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lang/c/CMakeLists.txt b/lang/c/CMakeLists.txt
index f3a013c4..0c359fae 100644
--- a/lang/c/CMakeLists.txt
+++ b/lang/c/CMakeLists.txt
@@ -121,7 +121,7 @@ endif(WIN32 AND NOT MINGW)
# Thread support (only for *nix with pthreads)
set(THREADS_LIBRARIES)
-if(UNIX AND THREADSAFE AND CMAKE_COMPILER_IS_GNUCC)
+if((UNIX OR MINGW) AND THREADSAFE AND CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_THREAD_PREFER_PTHREAD)
find_package(Threads)
@@ -131,7 +131,7 @@ if(UNIX AND THREADSAFE AND CMAKE_COMPILER_IS_GNUCC)
add_definitions(-DTHREADSAFE -D_REENTRANT)
set(THREADS_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-endif(UNIX AND THREADSAFE AND CMAKE_COMPILER_IS_GNUCC)
+endif((UNIX OR MINGW) AND THREADSAFE AND CMAKE_COMPILER_IS_GNUCC)
include_directories(${AvroC_SOURCE_DIR}/src)
diff --git a/lang/c/src/errors.c b/lang/c/src/errors.c
index 8abd8c83..a320810f 100644
--- a/lang/c/src/errors.c
+++ b/lang/c/src/errors.c
@@ -42,7 +42,7 @@ struct avro_error_data_t {
#if defined THREADSAFE
-#if ( defined __unix__ || defined __unix )
+#if ( defined __unix__ || defined __unix || defined __MINGW32__ )
#include <pthread.h>
static pthread_key_t error_data_key;
static pthread_once_t error_data_key_once = PTHREAD_ONCE_INIT;
@@ -63,7 +63,7 @@ static struct avro_error_data_t *
avro_get_error_data(void)
{
#if defined THREADSAFE
-#if defined __unix__ || defined __unix
+#if defined __unix__ || defined __unix || defined __MINGW32__
pthread_once(&error_data_key_once, make_error_data_key);
--
2.26.2.windows.1