From 4016f39d2ed781031613ad027bb13a4529984bfa Mon Sep 17 00:00:00 2001
From: Quinton Miller <nicetas.c@gmail.com>
Date: Fri, 25 Oct 2024 15:34:02 +0800
Subject: [PATCH] Use per-thread libxml2 global state on all platforms (#15121)

libxml2's build files enable threads by default, so I'd be surprised if any platform still disables them (embedded systems don't count yet).
---
 src/xml.cr         | 14 ++------------
 src/xml/libxml2.cr | 10 ++--------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/xml.cr b/src/xml.cr
index e0529be130f3..a9c9eab5d64e 100644
--- a/src/xml.cr
+++ b/src/xml.cr
@@ -107,12 +107,7 @@ module XML
   end
 
   protected def self.with_indent_tree_output(indent : Bool, &)
-    ptr = {% if flag?(:win32) %}
-            LibXML.__xmlIndentTreeOutput
-          {% else %}
-            pointerof(LibXML.xmlIndentTreeOutput)
-          {% end %}
-
+    ptr = LibXML.__xmlIndentTreeOutput
     old, ptr.value = ptr.value, indent ? 1 : 0
     begin
       yield
@@ -122,12 +117,7 @@ module XML
   end
 
   protected def self.with_tree_indent_string(string : String, &)
-    ptr = {% if flag?(:win32) %}
-            LibXML.__xmlTreeIndentString
-          {% else %}
-            pointerof(LibXML.xmlTreeIndentString)
-          {% end %}
-
+    ptr = LibXML.__xmlTreeIndentString
     old, ptr.value = ptr.value, string.to_unsafe
     begin
       yield
diff --git a/src/xml/libxml2.cr b/src/xml/libxml2.cr
index e1c2b8d12372..fbfb0702faef 100644
--- a/src/xml/libxml2.cr
+++ b/src/xml/libxml2.cr
@@ -13,14 +13,8 @@ lib LibXML
 
   fun xmlInitParser
 
-  # TODO: check if other platforms also support per-thread globals
-  {% if flag?(:win32) %}
-    fun __xmlIndentTreeOutput : Int*
-    fun __xmlTreeIndentString : UInt8**
-  {% else %}
-    $xmlIndentTreeOutput : Int
-    $xmlTreeIndentString : UInt8*
-  {% end %}
+  fun __xmlIndentTreeOutput : Int*
+  fun __xmlTreeIndentString : UInt8**
 
   alias Dtd = Void*
   alias Dict = Void*