Merge branch 'yggdrasil' into docs

Author: langmm

include/rapidjson/pyrj.h

@@ -26,8 +26,12 @@ RAPIDJSON_NAMESPACE_END
 #define END_PY_GIL
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_BEGIN_GLOBAL
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_END_GLOBAL
+#ifndef YGGDRASIL_PYGIL_ALLOW_THREADS_BEGIN
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_BEGIN
+#endif
+#ifndef YGGDRASIL_PYGIL_ALLOW_THREADS_END
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_END
+#endif
 #define YGGDRASIL_PYGIL_CRITICAL_BEGIN(name)
 #define YGGDRASIL_PYGIL_CRITICAL_END()
 #else // YGGDRASIL_DISABLE_PYTHON_C_API
@@ -80,17 +84,25 @@ RAPIDJSON_NAMESPACE_BEGIN
   CHECK_REFS(cleanup)
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_BEGIN_GLOBAL
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_END_GLOBAL
+#ifndef YGGDRASIL_PYGIL_ALLOW_THREADS_BEGIN
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_BEGIN
+#endif
+#ifndef YGGDRASIL_PYGIL_ALLOW_THREADS_END
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_END
+#endif
 #define YGGDRASIL_PYGIL_CRITICAL_BEGIN(name)
 #define YGGDRASIL_PYGIL_CRITICAL_END()
 #else // YGGDRASIL_PYGIL_NO_MANAGEMENT
 #define BEGIN_PY_GIL global_PyGILState();
 #define END_PY_GIL global_PyGILState(true);
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_BEGIN_GLOBAL
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_END_GLOBAL
+#ifndef YGGDRASIL_PYGIL_ALLOW_THREADS_BEGIN
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_BEGIN global_PyThreadState();
+#endif
+#ifndef YGGDRASIL_PYGIL_ALLOW_THREADS_END
 #define YGGDRASIL_PYGIL_ALLOW_THREADS_END global_PyThreadState(true);
+#endif
 #ifdef Py_BEGIN_CRITICAL_SECTION
 #define YGGDRASIL_PYGIL_CRITICAL_BEGIN(name) \
   Py_BEGIN_CRITICAL_SECTION(name)