From cedccc9f090439bcd3a91c55d1109380ebf5ed5c Mon Sep 17 00:00:00 2001
From: rfm <richardfrithmacdonald@gmail.com>
Date: Mon, 27 Jan 2025 11:13:18 +0000
Subject: [PATCH] Fixup location of declaration of new ivars

---
 Headers/Foundation/NSThread.h | 3 ---
 Source/NSThread.m             | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Headers/Foundation/NSThread.h b/Headers/Foundation/NSThread.h
index c3784cc42..663a8b6bf 100644
--- a/Headers/Foundation/NSThread.h
+++ b/Headers/Foundation/NSThread.h
@@ -71,14 +71,11 @@ GS_EXPORT_CLASS
   BOOL			_cancelled;
   BOOL			_active;
   BOOL			_finished;
-  BOOL			_targetIsBlock;
   NSHandler		*_exception_handler;    // Not retained.
   NSMutableDictionary	*_thread_dictionary;
   struct autorelease_thread_vars _autorelease_vars;
   id			_gcontext;
   void                  *_runLoopInfo;  // Per-thread runloop related info.
-  // Used to store a GSICUStringCollatorCache object for this thread.
-  id    _stringCollatorCache;
 #endif
 #if     GS_NONFRAGILE
 #  if defined(GS_NSThread_IVARS)
diff --git a/Source/NSThread.m b/Source/NSThread.m
index 70ed46b45..94513a778 100644
--- a/Source/NSThread.m
+++ b/Source/NSThread.m
@@ -96,6 +96,8 @@ typedef struct {
 
 #define	EXPOSE_NSThread_IVARS	1
 #define	GS_NSThread_IVARS \
+  id                    _stringCollatorCache; \
+  BOOL                  _targetIsBlock; \
   gs_thread_id_t        _pthreadID; \
   NSUInteger            _threadID; \
   GSLockInfo            _lockInfo