From 1f263c50b70a03c356cfbc0864ff88dbec34c376 Mon Sep 17 00:00:00 2001
From: Colen Garoutte-Carson <49173979+Colengms@users.noreply.github.com>
Date: Thu, 19 Sep 2024 15:29:14 -0700
Subject: [PATCH] Work around issue with clang 18 and size_t (#12739)

---
 Extension/bin/linux.clang.arm.json     | 5 +++--
 Extension/bin/linux.clang.arm64.json   | 5 +++--
 Extension/bin/linux.clang.x64.json     | 5 +++--
 Extension/bin/linux.clang.x86.json     | 5 +++--
 Extension/bin/macos.clang.arm.json     | 5 +++--
 Extension/bin/macos.clang.arm64.json   | 5 +++--
 Extension/bin/macos.clang.x64.json     | 5 +++--
 Extension/bin/macos.clang.x86.json     | 5 +++--
 Extension/bin/windows.clang.arm.json   | 3 ++-
 Extension/bin/windows.clang.arm64.json | 3 ++-
 Extension/bin/windows.clang.x64.json   | 3 ++-
 Extension/bin/windows.clang.x86.json   | 3 ++-
 12 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/Extension/bin/linux.clang.arm.json b/Extension/bin/linux.clang.arm.json
index f582efccf..0f795aa6a 100644
--- a/Extension/bin/linux.clang.arm.json
+++ b/Extension/bin/linux.clang.arm.json
@@ -1,5 +1,6 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8",
     "-Dunix=1",
@@ -11,5 +12,5 @@
     "-D__SIZE_TYPE__=unsigned int",
     "-D__WCHAR_TYPE__=long int"
   ],
-  "defaults_op" :  "merge"
-}
\ No newline at end of file
+  "defaults_op": "merge"
+}
diff --git a/Extension/bin/linux.clang.arm64.json b/Extension/bin/linux.clang.arm64.json
index d75b8d805..d1532b6cf 100644
--- a/Extension/bin/linux.clang.arm64.json
+++ b/Extension/bin/linux.clang.arm64.json
@@ -1,5 +1,6 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8",
     "-Dunix=1",
@@ -11,5 +12,5 @@
     "-D__SIZE_TYPE__=long unsigned int",
     "-D__WCHAR_TYPE__=int"
   ],
-  "defaults_op" :  "merge"
-}
\ No newline at end of file
+  "defaults_op": "merge"
+}
diff --git a/Extension/bin/linux.clang.x64.json b/Extension/bin/linux.clang.x64.json
index 24d8e7840..c97f777c2 100644
--- a/Extension/bin/linux.clang.x64.json
+++ b/Extension/bin/linux.clang.x64.json
@@ -1,5 +1,6 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8",
     "-Dunix=1",
@@ -11,5 +12,5 @@
     "-D__SIZE_TYPE__=long unsigned int",
     "-D__WCHAR_TYPE__=int"
   ],
-  "defaults_op" :  "merge"
-}
\ No newline at end of file
+  "defaults_op": "merge"
+}
diff --git a/Extension/bin/linux.clang.x86.json b/Extension/bin/linux.clang.x86.json
index d026cd030..6297e6640 100644
--- a/Extension/bin/linux.clang.x86.json
+++ b/Extension/bin/linux.clang.x86.json
@@ -1,5 +1,6 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8",
     "-Dunix=1",
@@ -11,5 +12,5 @@
     "-D__SIZE_TYPE__=unsigned int",
     "-D__WCHAR_TYPE__=long int"
   ],
-  "defaults_op" :  "merge"
-}
\ No newline at end of file
+  "defaults_op": "merge"
+}
diff --git a/Extension/bin/macos.clang.arm.json b/Extension/bin/macos.clang.arm.json
index 92823ac52..6c79a52e3 100644
--- a/Extension/bin/macos.clang.arm.json
+++ b/Extension/bin/macos.clang.arm.json
@@ -1,5 +1,6 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8",
     "-D__APPLE__=1",
@@ -10,5 +11,5 @@
     "-D__SIZE_TYPE__=unsigned int",
     "-D__WCHAR_TYPE__=long int"
   ],
-  "defaults_op" :  "merge"
-}
\ No newline at end of file
+  "defaults_op": "merge"
+}
diff --git a/Extension/bin/macos.clang.arm64.json b/Extension/bin/macos.clang.arm64.json
index 18721f3eb..d4ebbb73d 100644
--- a/Extension/bin/macos.clang.arm64.json
+++ b/Extension/bin/macos.clang.arm64.json
@@ -1,5 +1,6 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8",
     "-D__APPLE__=1",
@@ -10,5 +11,5 @@
     "-D__SIZE_TYPE__=long unsigned int",
     "-D__WCHAR_TYPE__=int"
   ],
-  "defaults_op" :  "merge"
-}
\ No newline at end of file
+  "defaults_op": "merge"
+}
diff --git a/Extension/bin/macos.clang.x64.json b/Extension/bin/macos.clang.x64.json
index d049f22ea..8f0647d3e 100644
--- a/Extension/bin/macos.clang.x64.json
+++ b/Extension/bin/macos.clang.x64.json
@@ -1,5 +1,6 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8",
     "-D__APPLE__=1",
@@ -10,5 +11,5 @@
     "-D__SIZE_TYPE__=long unsigned int",
     "-D__WCHAR_TYPE__=int"
   ],
-  "defaults_op" :  "merge"
-}
\ No newline at end of file
+  "defaults_op": "merge"
+}
diff --git a/Extension/bin/macos.clang.x86.json b/Extension/bin/macos.clang.x86.json
index b6189bb0a..83f568c28 100644
--- a/Extension/bin/macos.clang.x86.json
+++ b/Extension/bin/macos.clang.x86.json
@@ -1,5 +1,6 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8",
     "-D__APPLE__=1",
@@ -10,5 +11,5 @@
     "-D__SIZE_TYPE__=unsigned int",
     "-D__WCHAR_TYPE__=long int"
   ],
-  "defaults_op" :  "merge"
-}
\ No newline at end of file
+  "defaults_op": "merge"
+}
diff --git a/Extension/bin/windows.clang.arm.json b/Extension/bin/windows.clang.arm.json
index 37e18b926..c78d5d304 100644
--- a/Extension/bin/windows.clang.arm.json
+++ b/Extension/bin/windows.clang.arm.json
@@ -1,7 +1,8 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8"
   ],
   "defaults_op": "merge"
-}
\ No newline at end of file
+}
diff --git a/Extension/bin/windows.clang.arm64.json b/Extension/bin/windows.clang.arm64.json
index 37e18b926..c78d5d304 100644
--- a/Extension/bin/windows.clang.arm64.json
+++ b/Extension/bin/windows.clang.arm64.json
@@ -1,7 +1,8 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8"
   ],
   "defaults_op": "merge"
-}
\ No newline at end of file
+}
diff --git a/Extension/bin/windows.clang.x64.json b/Extension/bin/windows.clang.x64.json
index 37e18b926..c78d5d304 100644
--- a/Extension/bin/windows.clang.x64.json
+++ b/Extension/bin/windows.clang.x64.json
@@ -1,7 +1,8 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8"
   ],
   "defaults_op": "merge"
-}
\ No newline at end of file
+}
diff --git a/Extension/bin/windows.clang.x86.json b/Extension/bin/windows.clang.x86.json
index 37e18b926..c78d5d304 100644
--- a/Extension/bin/windows.clang.x86.json
+++ b/Extension/bin/windows.clang.x86.json
@@ -1,7 +1,8 @@
 {
   "defaults": [
+    "-D__building_module(x)=0",
     "--pack_alignment",
     "8"
   ],
   "defaults_op": "merge"
-}
\ No newline at end of file
+}