From 720f7d7ef5d06366cdbae51cd67a6883e994880b Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 10 Apr 2024 11:25:07 -0500
Subject: Fix mac build (#1182)

* Fix mac build

* Mac build take 2

* Mac build take 3
---
 indra/newview/gltf/asset.cpp     |  2 ++
 indra/newview/gltf/primitive.cpp | 16 ++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'indra/newview/gltf')

diff --git a/indra/newview/gltf/asset.cpp b/indra/newview/gltf/asset.cpp
index 18f814c5b6..092b6e5d4b 100644
--- a/indra/newview/gltf/asset.cpp
+++ b/indra/newview/gltf/asset.cpp
@@ -24,6 +24,8 @@
  * $/LicenseInfo$
  */
 
+#include "../llviewerprecompiledheaders.h"
+
 #include "asset.h"
 #include "llvolumeoctree.h"
 
diff --git a/indra/newview/gltf/primitive.cpp b/indra/newview/gltf/primitive.cpp
index dca3ccf706..71654dcfdd 100644
--- a/indra/newview/gltf/primitive.cpp
+++ b/indra/newview/gltf/primitive.cpp
@@ -9,7 +9,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
+ * version 2.1 of the License only. 
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,34 +24,38 @@
  * $/LicenseInfo$
  */
 
+#include "../llviewerprecompiledheaders.h"
+
 #include "asset.h"
 #include "../lltinygltfhelper.h"
 
 using namespace LL::GLTF;
 
-#ifndef __PRETTY_FUNCTION__
-#define __PRETTY_FUNCTION__ __FUNCSIG__
+#ifdef _MSC_VER
+#define LL_FUNCSIG __FUNCSIG__ 
+#else
+#define LL_FUNCSIG __PRETTY_FUNCTION__
 #endif
 
 // copy one vec3 from src to dst
 template<class S, class T>
 void copyVec2(S* src, T& dst)
 {
-    LL_ERRS() << "TODO: implement " << __PRETTY_FUNCTION__ << LL_ENDL;
+    LL_ERRS() << "TODO: implement " << LL_FUNCSIG << LL_ENDL;
 }
 
 // copy one vec3 from src to dst
 template<class S, class T>
 void copyVec3(S* src, T& dst)
 {
-    LL_ERRS() << "TODO: implement " << __PRETTY_FUNCTION__ << LL_ENDL;
+    LL_ERRS() << "TODO: implement " << LL_FUNCSIG << LL_ENDL;
 }
 
 // copy one vec4 from src to dst
 template<class S, class T>
 void copyVec4(S* src, T& dst)
 {
-    LL_ERRS() << "TODO: implement " << __PRETTY_FUNCTION__ << LL_ENDL;
+    LL_ERRS() << "TODO: implement " << LL_FUNCSIG << LL_ENDL;
 }
 
 template<>
-- 
cgit v1.2.3